diff options
| author | pkotwicz@chromium.org <pkotwicz@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-03-18 12:27:51 +0000 |
|---|---|---|
| committer | pkotwicz@chromium.org <pkotwicz@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-03-18 12:27:51 +0000 |
| commit | f8c6404864da36c2f86bafcb6e1b7a2952449bc2 (patch) | |
| tree | b9fdf623aff77ae481cb8c93db08a86da29b7d8b /ash | |
| parent | 2af0b75a842f33f1bfe3fd777358d6fb270f0cbb (diff) | |
| download | chromium_src-f8c6404864da36c2f86bafcb6e1b7a2952449bc2.zip chromium_src-f8c6404864da36c2f86bafcb6e1b7a2952449bc2.tar.gz chromium_src-f8c6404864da36c2f86bafcb6e1b7a2952449bc2.tar.bz2 | |
Adds system menu from views::BrowserView.
Mostly copying and pasting from chromeos::BrowserView
Changed toplevel_window_event_filter to ignore right clicks.
Bug=117096
Test=Manual
Committed: http://src.chromium.org/viewvc/chrome?view=rev&revision=127392
Review URL: https://chromiumcodereview.appspot.com/9646005
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@127409 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'ash')
| -rw-r--r-- | ash/wm/toplevel_window_event_filter.cc | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/ash/wm/toplevel_window_event_filter.cc b/ash/wm/toplevel_window_event_filter.cc index 98f761b..292fb19 100644 --- a/ash/wm/toplevel_window_event_filter.cc +++ b/ash/wm/toplevel_window_event_filter.cc @@ -56,6 +56,10 @@ bool ToplevelWindowEventFilter::PreHandleKeyEvent(aura::Window* target, bool ToplevelWindowEventFilter::PreHandleMouseEvent(aura::Window* target, aura::MouseEvent* event) { + if ((event->flags() & + (ui::EF_MIDDLE_MOUSE_BUTTON | ui::EF_RIGHT_MOUSE_BUTTON)) != 0) + return false; + switch (event->type()) { case ui::ET_MOUSE_PRESSED: { // We also update the current window component here because for the @@ -73,9 +77,7 @@ bool ToplevelWindowEventFilter::PreHandleMouseEvent(aura::Window* target, } else { window_resizer_.reset(); } - if (component == HTCAPTION && - event->flags() & ui::EF_IS_DOUBLE_CLICK && - event->flags() & ui::EF_LEFT_MOUSE_BUTTON) + if (component == HTCAPTION && event->flags() & ui::EF_IS_DOUBLE_CLICK) ToggleMaximizedState(target); return WindowResizer::GetBoundsChangeForWindowComponent(component) != 0; } |