From 431552ca5af1f9d2cb09994e1d75e1d7f30cf002 Mon Sep 17 00:00:00 2001 From: "oshima@chromium.org" Date: Tue, 23 Oct 2012 00:38:33 +0000 Subject: Context menu for multiple launchers - move the code to create/open context menu from launcher to root window controller. - updated methods that access shelf/launcher state to take root window so that menu can specify on which display it is working on. BUG=145978, 155776 TEST=none Review URL: https://chromiumcodereview.appspot.com/11198078 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@163459 0039d316-1c4b-4281-b951-d872f2087c98 --- ash/shell_delegate.h | 8 ++++++++ 1 file changed, 8 insertions(+) (limited to 'ash/shell_delegate.h') diff --git a/ash/shell_delegate.h b/ash/shell_delegate.h index afef3a9..d1cde49 100644 --- a/ash/shell_delegate.h +++ b/ash/shell_delegate.h @@ -18,12 +18,17 @@ class AppListViewDelegate; } namespace aura { +class RootWindow; class Window; namespace client { class UserActionClient; } } +namespace ui { +class MenuModel; +} + namespace views { class Widget; } @@ -172,6 +177,9 @@ class ASH_EXPORT ShellDelegate { // Gets a saved value of the zoom scale of full screen magnifier. If a value // is not saved, return a negative value. virtual double GetSavedScreenMagnifierScale() = 0; + + // Creates a menu model of the context for the |root_window|. + virtual ui::MenuModel* CreateContextMenu(aura::RootWindow* root_window) = 0; }; } // namespace ash -- cgit v1.1