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

Unified Diff: ash/common/shelf/shelf_view.cc

Issue 2741273002: chromeos: Promotes more from WmShell to Shell (Closed)
Patch Set: feedback Created 3 years, 9 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/common/accelerators/exit_warning_handler.cc ('k') | ash/common/shutdown_controller.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: ash/common/shelf/shelf_view.cc
diff --git a/ash/common/shelf/shelf_view.cc b/ash/common/shelf/shelf_view.cc
index 7f712b4a00febd5b3abd15179b74fab956cdbc8c..6250d554e21b90ce151ce1ed994373da2499322e 100644
--- a/ash/common/shelf/shelf_view.cc
+++ b/ash/common/shelf/shelf_view.cc
@@ -25,6 +25,7 @@
#include "ash/common/wm/root_window_finder.h"
#include "ash/common/wm_shell.h"
#include "ash/common/wm_window.h"
+#include "ash/shell.h"
#include "ash/strings/grit/ash_strings.h"
#include "base/auto_reset.h"
#include "base/memory/ptr_util.h"
@@ -1639,7 +1640,7 @@ void ShelfView::ShowContextMenuForView(views::View* source,
}
std::unique_ptr<ui::MenuModel> context_menu_model(
- WmShell::Get()->delegate()->CreateContextMenu(wm_shelf_, item));
+ Shell::Get()->shell_delegate()->CreateContextMenu(wm_shelf_, item));
if (!context_menu_model)
return;
« no previous file with comments | « ash/common/accelerators/exit_warning_handler.cc ('k') | ash/common/shutdown_controller.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698