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

Unified Diff: chrome/browser/ui/ash/chrome_shell_delegate.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
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 351a90acf7f62e418f3fff3e8434ae0818212c51..a7d4ab1933f86b23cb3f5c9f008cad2f256958d4 100644
--- a/chrome/browser/ui/ash/chrome_shell_delegate.cc
+++ b/chrome/browser/ui/ash/chrome_shell_delegate.cc
@@ -436,14 +436,14 @@ ChromeShellDelegate::CreatePointerWatcherDelegate() {
}
ui::MenuModel* ChromeShellDelegate::CreateContextMenu(
- ash::Shelf* shelf,
+ ash::WmShelf* wm_shelf,
const ash::ShelfItem* item) {
DCHECK(shelf_delegate_);
// Don't show context menu for exclusive app runtime mode.
if (chrome::IsRunningInAppMode())
return nullptr;
- return LauncherContextMenu::Create(shelf_delegate_, item, shelf);
+ return LauncherContextMenu::Create(shelf_delegate_, item, wm_shelf);
}
ash::GPUSupport* ChromeShellDelegate::CreateGPUSupport() {
« no previous file with comments | « chrome/browser/ui/ash/chrome_shell_delegate.h ('k') | chrome/browser/ui/ash/launcher/arc_launcher_context_menu.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698