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

Unified Diff: ash/shell/shell_delegate_impl.cc

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/shell_delegate_impl.h ('k') | ash/shell_delegate.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: ash/shell/shell_delegate_impl.cc
diff --git a/ash/shell/shell_delegate_impl.cc b/ash/shell/shell_delegate_impl.cc
index 7eb927e099281ffff57881bb267ce6721b870153..690e0fca8b8d53ca3ac3abe0512991bc1f967221 100644
--- a/ash/shell/shell_delegate_impl.cc
+++ b/ash/shell/shell_delegate_impl.cc
@@ -266,10 +266,9 @@ ShellDelegateImpl::CreatePointerWatcherDelegate() {
return base::WrapUnique(new PointerWatcherDelegateAura);
}
-ui::MenuModel* ShellDelegateImpl::CreateContextMenu(
- ash::Shelf* shelf,
- const ash::ShelfItem* item) {
- return new ContextMenu(shelf);
+ui::MenuModel* ShellDelegateImpl::CreateContextMenu(WmShelf* wm_shelf,
+ const ShelfItem* item) {
+ return new ContextMenu(wm_shelf);
}
GPUSupport* ShellDelegateImpl::CreateGPUSupport() {
« no previous file with comments | « ash/shell/shell_delegate_impl.h ('k') | ash/shell_delegate.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698