diff options
| author | varunjain@chromium.org <varunjain@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-09-15 13:41:38 +0000 |
|---|---|---|
| committer | varunjain@chromium.org <varunjain@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-09-15 13:41:38 +0000 |
| commit | 08eef648d01199213cc94a684e23d3a0c1daa9db (patch) | |
| tree | cfeb9952c03c3e022af7c68e2a77d4c281b5127b /ash | |
| parent | 0e71dee10d64bd664e8550f93b5f40a2e3b71c4b (diff) | |
| download | chromium_src-08eef648d01199213cc94a684e23d3a0c1daa9db.zip chromium_src-08eef648d01199213cc94a684e23d3a0c1daa9db.tar.gz chromium_src-08eef648d01199213cc94a684e23d3a0c1daa9db.tar.bz2 | |
Context menus on view elements should be positioned above the finger when
invoked using long press.
BUG=142015
Review URL: https://codereview.chromium.org/10916180
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@157005 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'ash')
| -rw-r--r-- | ash/launcher/launcher_view.cc | 3 | ||||
| -rw-r--r-- | ash/shell/window_type_launcher.cc | 3 | ||||
| -rw-r--r-- | ash/shell_context_menu.cc | 4 |
3 files changed, 6 insertions, 4 deletions
diff --git a/ash/launcher/launcher_view.cc b/ash/launcher/launcher_view.cc index daab213..f346c69 100644 --- a/ash/launcher/launcher_view.cc +++ b/ash/launcher/launcher_view.cc @@ -1059,7 +1059,8 @@ void LauncherView::ShowContextMenuForView(views::View* source, // code. if (launcher_menu_runner_->RunMenuAt( source->GetWidget(), NULL, gfx::Rect(point, gfx::Size()), - views::MenuItemView::TOPLEFT, 0) == views::MenuRunner::MENU_DELETED) + views::MenuItemView::TOPLEFT, views::MenuRunner::CONTEXT_MENU) == + views::MenuRunner::MENU_DELETED) return; Shell::GetInstance()->UpdateShelfVisibility(); diff --git a/ash/shell/window_type_launcher.cc b/ash/shell/window_type_launcher.cc index c9032db..fa9a7e4 100644 --- a/ash/shell/window_type_launcher.cc +++ b/ash/shell/window_type_launcher.cc @@ -373,7 +373,8 @@ void WindowTypeLauncher::ShowContextMenuForView(views::View* source, menu_runner_.reset(new MenuRunner(root)); if (menu_runner_->RunMenuAt(GetWidget(), NULL, gfx::Rect(point, gfx::Size()), MenuItemView::TOPLEFT, - MenuRunner::HAS_MNEMONICS) == MenuRunner::MENU_DELETED) + MenuRunner::HAS_MNEMONICS | views::MenuRunner::CONTEXT_MENU) == + MenuRunner::MENU_DELETED) return; } #endif // !defined(OS_MACOSX) diff --git a/ash/shell_context_menu.cc b/ash/shell_context_menu.cc index e704147..5e190c3 100644 --- a/ash/shell_context_menu.cc +++ b/ash/shell_context_menu.cc @@ -32,8 +32,8 @@ void ShellContextMenu::ShowMenu(views::Widget* widget, menu_runner_.reset(new views::MenuRunner(menu_model_adapter.CreateMenu())); if (menu_runner_->RunMenuAt( widget, NULL, gfx::Rect(location, gfx::Size()), - views::MenuItemView::TOPLEFT, views::MenuRunner::HAS_MNEMONICS) == - views::MenuRunner::MENU_DELETED) + views::MenuItemView::TOPLEFT, views::MenuRunner::HAS_MNEMONICS | + views::MenuRunner::CONTEXT_MENU) == views::MenuRunner::MENU_DELETED) return; } |