Differential D23984 Diff 69308 head/www/chromium/files/patch-chrome_browser_ui_views_frame_opaque__browser__frame__view.cc
Changeset View
Changeset View
Standalone View
Standalone View
head/www/chromium/files/patch-chrome_browser_ui_views_frame_opaque__browser__frame__view.cc
| --- chrome/browser/ui/views/frame/opaque_browser_frame_view.cc.orig 2019-12-16 21:51:24 UTC | --- chrome/browser/ui/views/frame/opaque_browser_frame_view.cc.orig 2020-03-03 18:53:52 UTC | ||||
| +++ chrome/browser/ui/views/frame/opaque_browser_frame_view.cc | +++ chrome/browser/ui/views/frame/opaque_browser_frame_view.cc | ||||
| @@ -48,7 +48,7 @@ | @@ -48,7 +48,7 @@ | ||||
| #include "ui/views/window/vector_icons/vector_icons.h" | #include "ui/views/window/vector_icons/vector_icons.h" | ||||
| #include "ui/views/window/window_shape.h" | #include "ui/views/window/window_shape.h" | ||||
| -#if defined(OS_LINUX) | -#if defined(OS_LINUX) | ||||
| +#if defined(OS_LINUX) || defined(OS_BSD) | +#if defined(OS_LINUX) || defined(OS_BSD) | ||||
| #include "ui/views/controls/menu/menu_runner.h" | #include "ui/views/controls/menu/menu_runner.h" | ||||
| #endif | #endif | ||||
| @@ -354,7 +354,7 @@ void OpaqueBrowserFrameView::ButtonPressed(views::Butt | @@ -352,7 +352,7 @@ void OpaqueBrowserFrameView::ButtonPressed(views::Butt | ||||
| void OpaqueBrowserFrameView::OnMenuButtonClicked(views::Button* source, | } else if (sender == close_button_) { | ||||
| const gfx::Point& point, | frame()->CloseWithReason(views::Widget::ClosedReason::kCloseButtonClicked); | ||||
| const ui::Event* event) { | } else if (sender == window_icon_) { | ||||
| -#if defined(OS_LINUX) | -#if defined(OS_LINUX) | ||||
| +#if defined(OS_LINUX) || defined(OS_BSD) | +#if defined(OS_LINUX) || defined(OS_BSD) | ||||
| // TODO(pbos): Figure out / document why this is Linux only. This needs a | |||||
| // comment. | |||||
| views::MenuRunner menu_runner(frame()->GetSystemMenuModel(), | views::MenuRunner menu_runner(frame()->GetSystemMenuModel(), | ||||
| views::MenuRunner::HAS_MNEMONICS); | @@ -481,7 +481,7 @@ bool OpaqueBrowserFrameView::EverHasVisibleBackgroundT | ||||
| menu_runner.RunMenuAt( | |||||
| @@ -480,7 +480,7 @@ bool OpaqueBrowserFrameView::EverHasVisibleBackgroundT | |||||
| OpaqueBrowserFrameView::FrameButtonStyle | OpaqueBrowserFrameView::FrameButtonStyle | ||||
| OpaqueBrowserFrameView::GetFrameButtonStyle() const { | OpaqueBrowserFrameView::GetFrameButtonStyle() const { | ||||
| -#if defined(OS_LINUX) && !defined(OS_CHROMEOS) | -#if defined(OS_LINUX) && !defined(OS_CHROMEOS) | ||||
| +#if (defined(OS_LINUX) && !defined(OS_CHROMEOS)) || defined(OS_BSD) | +#if (defined(OS_LINUX) && !defined(OS_CHROMEOS)) || defined(OS_BSD) | ||||
| return FrameButtonStyle::kMdButton; | return FrameButtonStyle::kMdButton; | ||||
| #else | #else | ||||
| return FrameButtonStyle::kImageButton; | return FrameButtonStyle::kImageButton; | ||||