diff options
| author | oshima@chromium.org <oshima@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-10-23 00:38:33 +0000 |
|---|---|---|
| committer | oshima@chromium.org <oshima@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-10-23 00:38:33 +0000 |
| commit | 431552ca5af1f9d2cb09994e1d75e1d7f30cf002 (patch) | |
| tree | 545584aa7c60c78021fa18e38c04c20fb248c31d /ash/shell/launcher_delegate_impl.h | |
| parent | 1cca163c30823ea0531b9a84ddeb5a136c0927ad (diff) | |
| download | chromium_src-431552ca5af1f9d2cb09994e1d75e1d7f30cf002.zip chromium_src-431552ca5af1f9d2cb09994e1d75e1d7f30cf002.tar.gz chromium_src-431552ca5af1f9d2cb09994e1d75e1d7f30cf002.tar.bz2 | |
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
Diffstat (limited to 'ash/shell/launcher_delegate_impl.h')
| -rw-r--r-- | ash/shell/launcher_delegate_impl.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/ash/shell/launcher_delegate_impl.h b/ash/shell/launcher_delegate_impl.h index 18440ef..978ddaf 100644 --- a/ash/shell/launcher_delegate_impl.h +++ b/ash/shell/launcher_delegate_impl.h @@ -31,8 +31,8 @@ class LauncherDelegateImpl : public ash::LauncherDelegate { virtual int GetBrowserShortcutResourceId() OVERRIDE; virtual string16 GetTitle(const ash::LauncherItem& item) OVERRIDE; virtual ui::MenuModel* CreateContextMenu( - const ash::LauncherItem& item) OVERRIDE; - virtual ui::MenuModel* CreateContextMenuForLauncher() OVERRIDE; + const ash::LauncherItem& item, + aura::RootWindow* root) OVERRIDE; virtual ash::LauncherID GetIDByWindow(aura::Window* window) OVERRIDE; virtual bool IsDraggable(const ash::LauncherItem& item) OVERRIDE; |