Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(166)

Unified Diff: chrome/browser/ui/ash/launcher/launcher_context_menu.h

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/launcher/launcher_context_menu.h
diff --git a/chrome/browser/ui/ash/launcher/launcher_context_menu.h b/chrome/browser/ui/ash/launcher/launcher_context_menu.h
index bf73f1feaac7f0803f73d88ecc46dc5f16e873f7..a3e4ece82cf23794a22a0d9f3636b4f450b7e5f9 100644
--- a/chrome/browser/ui/ash/launcher/launcher_context_menu.h
+++ b/chrome/browser/ui/ash/launcher/launcher_context_menu.h
@@ -14,6 +14,10 @@
class ChromeLauncherController;
+namespace ash {
+class ShelfItemDelegate;
+}
+
namespace aura {
class Window;
}
@@ -31,6 +35,13 @@ class LauncherContextMenu : public ui::SimpleMenuModel,
LauncherContextMenu(ChromeLauncherController* controller,
const ash::LauncherItem* item,
aura::Window* root_window);
+
+ // Creates a menu used by item created by ShelfWindowWatcher.
+ LauncherContextMenu(ChromeLauncherController* controller,
+ ash::ShelfItemDelegate* item_delegate,
+ ash::LauncherItem* item,
+ aura::Window* root_window);
+
// Creates a menu used as a desktop context menu on |root_window|.
LauncherContextMenu(ChromeLauncherController* controller,
aura::Window* root_window);
@@ -90,6 +101,9 @@ class LauncherContextMenu : public ui::SimpleMenuModel,
aura::Window* root_window_;
+ // Not owned.
+ ash::ShelfItemDelegate* item_delegate_;
+
DISALLOW_COPY_AND_ASSIGN(LauncherContextMenu);
};

Powered by Google App Engine
This is Rietveld 408576698