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

Unified Diff: ash/shell/shell_delegate_impl.h

Issue 2046843005: mash: Migrate shelf menus to wm common types (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: ash_shell_with_content Created 4 years, 6 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
« no previous file with comments | « ash/shell/context_menu.cc ('k') | ash/shell/shell_delegate_impl.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: ash/shell/shell_delegate_impl.h
diff --git a/ash/shell/shell_delegate_impl.h b/ash/shell/shell_delegate_impl.h
index af66b988c643b146b82f5490565d8421e64e89c3..6bcd838f85cc647c989dcda580ddc420982902b1 100644
--- a/ash/shell/shell_delegate_impl.h
+++ b/ash/shell/shell_delegate_impl.h
@@ -58,8 +58,8 @@ class ShellDelegateImpl : public ash::ShellDelegate {
std::unique_ptr<ContainerDelegate> CreateContainerDelegate() override;
std::unique_ptr<PointerWatcherDelegate> CreatePointerWatcherDelegate()
override;
- ui::MenuModel* CreateContextMenu(ash::Shelf* shelf,
- const ash::ShelfItem* item) override;
+ ui::MenuModel* CreateContextMenu(WmShelf* wm_shelf,
+ const ShelfItem* item) override;
GPUSupport* CreateGPUSupport() override;
base::string16 GetProductName() const override;
gfx::Image GetDeprecatedAcceleratorImage() const override;
« no previous file with comments | « ash/shell/context_menu.cc ('k') | ash/shell/shell_delegate_impl.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698