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

Unified Diff: chrome/browser/ui/ash/chrome_shell_delegate.cc

Issue 2899253002: chromeos: Rename ash::WmShelf to Shelf (Closed)
Patch Set: rebase Created 3 years, 7 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 b946ec6c0897f8fde6aeaa37a131c16b482ba7fc..b418cee58c9d97a0831a545b8c8710a53ae39c44 100644
--- a/chrome/browser/ui/ash/chrome_shell_delegate.cc
+++ b/chrome/browser/ui/ash/chrome_shell_delegate.cc
@@ -510,7 +510,7 @@ void ChromeShellDelegate::ShelfShutdown() {
}
ui::MenuModel* ChromeShellDelegate::CreateContextMenu(
- ash::WmShelf* wm_shelf,
+ ash::Shelf* shelf,
const ash::ShelfItem* item) {
// Don't show context menu for exclusive app runtime mode.
if (chrome::IsRunningInAppMode())
@@ -523,8 +523,7 @@ ui::MenuModel* ChromeShellDelegate::CreateContextMenu(
if (!launcher_controller_)
return nullptr;
- return LauncherContextMenu::Create(launcher_controller_.get(), item,
- wm_shelf);
+ return LauncherContextMenu::Create(launcher_controller_.get(), item, 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