aboutsummaryrefslogtreecommitdiff
path: root/www/iridium/files/patch-chrome_browser_ui_views_frame_opaque__browser__frame__view.cc
diff options
context:
space:
mode:
Diffstat (limited to 'www/iridium/files/patch-chrome_browser_ui_views_frame_opaque__browser__frame__view.cc')
-rw-r--r--www/iridium/files/patch-chrome_browser_ui_views_frame_opaque__browser__frame__view.cc19
1 files changed, 14 insertions, 5 deletions
diff --git a/www/iridium/files/patch-chrome_browser_ui_views_frame_opaque__browser__frame__view.cc b/www/iridium/files/patch-chrome_browser_ui_views_frame_opaque__browser__frame__view.cc
index 7c36498cc1d5..794a1d2c3b13 100644
--- a/www/iridium/files/patch-chrome_browser_ui_views_frame_opaque__browser__frame__view.cc
+++ b/www/iridium/files/patch-chrome_browser_ui_views_frame_opaque__browser__frame__view.cc
@@ -1,7 +1,7 @@
---- chrome/browser/ui/views/frame/opaque_browser_frame_view.cc.orig 2017-06-05 19:03:03 UTC
+--- chrome/browser/ui/views/frame/opaque_browser_frame_view.cc.orig 2019-03-11 22:00:54 UTC
+++ chrome/browser/ui/views/frame/opaque_browser_frame_view.cc
-@@ -38,7 +38,7 @@
- #include "ui/views/window/frame_background.h"
+@@ -49,7 +49,7 @@
+ #include "ui/views/window/vector_icons/vector_icons.h"
#include "ui/views/window/window_shape.h"
-#if defined(OS_LINUX)
@@ -9,7 +9,7 @@
#include "ui/views/controls/menu/menu_runner.h"
#endif
-@@ -292,7 +292,7 @@ void OpaqueBrowserFrameView::ButtonPressed(views::Butt
+@@ -356,7 +356,7 @@ void OpaqueBrowserFrameView::ButtonPressed(views::Butt
void OpaqueBrowserFrameView::OnMenuButtonClicked(views::MenuButton* source,
const gfx::Point& point,
const ui::Event* event) {
@@ -17,4 +17,13 @@
+#if defined(OS_LINUX) || defined(OS_BSD)
views::MenuRunner menu_runner(frame()->GetSystemMenuModel(),
views::MenuRunner::HAS_MNEMONICS);
- ignore_result(menu_runner.RunMenuAt(browser_view()->GetWidget(),
+ menu_runner.RunMenuAt(browser_view()->GetWidget(), window_icon_,
+@@ -480,7 +480,7 @@ bool OpaqueBrowserFrameView::EverHasVisibleBackgroundT
+
+ OpaqueBrowserFrameView::FrameButtonStyle
+ OpaqueBrowserFrameView::GetFrameButtonStyle() const {
+-#if defined(OS_LINUX) && !defined(OS_CHROMEOS)
++#if (defined(OS_LINUX) && !defined(OS_CHROMEOS)) || defined(OS_BSD)
+ return FrameButtonStyle::kMdButton;
+ #else
+ return FrameButtonStyle::kImageButton;