diff options
| author | simonhong@chromium.org <simonhong@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2014-01-09 20:25:42 +0000 |
|---|---|---|
| committer | simonhong@chromium.org <simonhong@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2014-01-09 20:25:42 +0000 |
| commit | e0cfc7fc54879d4842afa11e953095b3ed728535 (patch) | |
| tree | 7f7bf5c8d2316a3a8dda0f6466018cce99d8b007 /ash/shell_delegate.h | |
| parent | 531cf0b269ebacb2e19d865218a95ee4851d6f92 (diff) | |
| download | chromium_src-e0cfc7fc54879d4842afa11e953095b3ed728535.zip chromium_src-e0cfc7fc54879d4842afa11e953095b3ed728535.tar.gz chromium_src-e0cfc7fc54879d4842afa11e953095b3ed728535.tar.bz2 | |
[ash] Add TYPE_DIALOG and its item's LauncherContextMenu
This is third CL for adding an item for dialog.
This cl adds new LauncherItemType, TYPE_DIALOG, and
implements a context menu of item created by ShelfWindowWatcher.
R=sky@chromium.org
BUG=121242
TEST=NONE
Review URL: https://codereview.chromium.org/107163005
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@243965 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'ash/shell_delegate.h')
| -rw-r--r-- | ash/shell_delegate.h | 8 |
1 files changed, 7 insertions, 1 deletions
diff --git a/ash/shell_delegate.h b/ash/shell_delegate.h index fecb655..452c420 100644 --- a/ash/shell_delegate.h +++ b/ash/shell_delegate.h @@ -49,6 +49,7 @@ class NewWindowDelegate; class WindowTreeHostFactory; class SessionStateDelegate; class ShelfDelegate; +class ShelfItemDelegate; class ShelfModel; class SystemTrayDelegate; class UserWallpaperDelegate; @@ -126,7 +127,12 @@ class ASH_EXPORT ShellDelegate { virtual aura::client::UserActionClient* CreateUserActionClient() = 0; // Creates a menu model of the context for the |root_window|. - virtual ui::MenuModel* CreateContextMenu(aura::Window* root_window) = 0; + // When a ContextMenu is used for an item created by ShelfWindowWatcher, + // passes its ShelfItemDelegate and LauncherItem. + virtual ui::MenuModel* CreateContextMenu( + aura::Window* root_window, + ash::ShelfItemDelegate* item_delegate, + ash::LauncherItem* item) = 0; // Creates a root window host factory. Shell takes ownership of the returned // value. |