summaryrefslogtreecommitdiff
path: root/www/chromium/files/patch-ui__views__bubble__bubble_delegate.cc
diff options
context:
space:
mode:
Diffstat (limited to 'www/chromium/files/patch-ui__views__bubble__bubble_delegate.cc')
-rw-r--r--www/chromium/files/patch-ui__views__bubble__bubble_delegate.cc12
1 files changed, 6 insertions, 6 deletions
diff --git a/www/chromium/files/patch-ui__views__bubble__bubble_delegate.cc b/www/chromium/files/patch-ui__views__bubble__bubble_delegate.cc
index 3de240129f4a..57439c97ff21 100644
--- a/www/chromium/files/patch-ui__views__bubble__bubble_delegate.cc
+++ b/www/chromium/files/patch-ui__views__bubble__bubble_delegate.cc
@@ -1,11 +1,11 @@
---- ui/views/bubble/bubble_delegate.cc.orig 2015-04-14 18:31:23.000000000 -0400
-+++ ui/views/bubble/bubble_delegate.cc 2015-04-28 08:17:15.923055000 -0400
-@@ -104,7 +104,7 @@
+--- ui/views/bubble/bubble_delegate.cc.orig 2015-10-14 19:28:13.258489000 +0200
++++ ui/views/bubble/bubble_delegate.cc 2015-10-14 19:28:52.612078000 +0200
+@@ -106,7 +106,7 @@
// the parent frame and let DWM handle compositing. If not, then we don't
// want to allow the bubble to extend the frame because it will be clipped.
bubble_delegate->set_adjust_if_offscreen(ui::win::IsAeroGlassEnabled());
--#elif defined(OS_LINUX) && !defined(OS_CHROMEOS)
-+#elif (defined(OS_LINUX) || defined(OS_BSD)) && !defined(OS_CHROMEOS)
+-#elif (defined(OS_LINUX) && !defined(OS_CHROMEOS)) || defined(OS_MACOSX)
++#elif (defined(OS_LINUX) && !defined(OS_CHROMEOS)) || defined(OS_MACOSX) || defined(OS_BSD)
// Linux clips bubble windows that extend outside their parent window bounds.
+ // Mac never adjusts.
bubble_delegate->set_adjust_if_offscreen(false);
- #endif