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

Issues Search
    My Issues | Starred     Open | Closed | All

Unified Diff: ash/test/test_shell_delegate.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
« ash/shelf/shelf_view.cc ('K') | « ash/test/test_shelf_item_delegate.cc ('k') | ash/test/test_shell_delegate.cc » ('j') | chrome/browser/ui/ash/launcher/launcher_context_menu.cc » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: ash/test/test_shell_delegate.h
diff --git a/ash/test/test_shell_delegate.h b/ash/test/test_shell_delegate.h
index 489b976e55e6d260a1799241b8123fe9843eb75a..f3d2d2dd97e4c9334dd6f36da726fe062cfc887d 100644
--- a/ash/test/test_shell_delegate.h
+++ b/ash/test/test_shell_delegate.h
@@ -50,7 +50,10 @@ class TestShellDelegate : public ShellDelegate {
virtual NewWindowDelegate* CreateNewWindowDelegate() OVERRIDE;
virtual MediaDelegate* CreateMediaDelegate() OVERRIDE;
virtual aura::client::UserActionClient* CreateUserActionClient() OVERRIDE;
- virtual ui::MenuModel* CreateContextMenu(aura::Window* root) OVERRIDE;
+ virtual ui::MenuModel* CreateContextMenu(
+ aura::Window* root,
+ ash::ShelfItemDelegate* item_delegate,
+ ash::LauncherItem* item) OVERRIDE;
virtual RootWindowHostFactory* CreateRootWindowHostFactory() OVERRIDE;
virtual base::string16 GetProductName() const OVERRIDE;
« ash/shelf/shelf_view.cc ('K') | « ash/test/test_shelf_item_delegate.cc ('k') | ash/test/test_shell_delegate.cc » ('j') | chrome/browser/ui/ash/launcher/launcher_context_menu.cc » ('J')

Powered by Google App Engine
This is Rietveld 408576698