Chromium Code Reviews
[email protected] (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(380)

Unified Diff: chrome/browser/ui/ash/chrome_shell_delegate.cc

Issue 107163005: [ash] Add TYPE_DIALOG and its item's LauncherContextMenu (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: rebased Created 6 years, 11 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
Index: chrome/browser/ui/ash/chrome_shell_delegate.cc
diff --git a/chrome/browser/ui/ash/chrome_shell_delegate.cc b/chrome/browser/ui/ash/chrome_shell_delegate.cc
index a3d887842c1b78fb631dd403688cac92c134b236..497c973ce53d1d802bae36e80e37322bdf4b0b9a 100644
--- a/chrome/browser/ui/ash/chrome_shell_delegate.cc
+++ b/chrome/browser/ui/ash/chrome_shell_delegate.cc
@@ -127,12 +127,18 @@ aura::client::UserActionClient* ChromeShellDelegate::CreateUserActionClient() {
return new UserActionHandler;
}
-ui::MenuModel* ChromeShellDelegate::CreateContextMenu(aura::Window* root) {
+ui::MenuModel* ChromeShellDelegate::CreateContextMenu(
+ aura::Window* root,
+ ash::ShelfItemDelegate* item_delegate,
+ ash::LauncherItem* item) {
DCHECK(shelf_delegate_);
// Don't show context menu for exclusive app runtime mode.
if (chrome::IsRunningInAppMode())
return NULL;
+ if (item_delegate && item)
+ return new LauncherContextMenu(shelf_delegate_, item_delegate, item, root);
+
return new LauncherContextMenu(shelf_delegate_, root);
}
« no previous file with comments | « chrome/browser/ui/ash/chrome_shell_delegate.h ('k') | chrome/browser/ui/ash/launcher/app_shortcut_launcher_item_controller.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698