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

Unified Diff: chrome/browser/ui/ash/launcher/launcher_context_menu.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
Index: chrome/browser/ui/ash/launcher/launcher_context_menu.cc
diff --git a/chrome/browser/ui/ash/launcher/launcher_context_menu.cc b/chrome/browser/ui/ash/launcher/launcher_context_menu.cc
index 3a74ace7f394341c6bee2fac214cd9d71bdac041..6ded50358eaec9daa3673c326ca0068c79d7c0f0 100644
--- a/chrome/browser/ui/ash/launcher/launcher_context_menu.cc
+++ b/chrome/browser/ui/ash/launcher/launcher_context_menu.cc
@@ -11,6 +11,7 @@
#include "ash/common/wallpaper/wallpaper_delegate.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 "build/build_config.h"
#include "chrome/browser/chromeos/login/users/wallpaper/wallpaper_manager.h"
@@ -98,9 +99,7 @@ bool LauncherContextMenu::IsCommandIdEnabled(int command_id) const {
return !item_.pinned_by_policy && (item_.type == ash::TYPE_APP_SHORTCUT ||
item_.type == ash::TYPE_APP);
case MENU_CHANGE_WALLPAPER:
- return ash::WmShell::Get()
- ->wallpaper_delegate()
- ->CanOpenSetWallpaperPage();
+ return ash::Shell::Get()->wallpaper_delegate()->CanOpenSetWallpaperPage();
case MENU_AUTO_HIDE:
return CanUserModifyShelfAutoHideBehavior(controller_->profile());
default:

Powered by Google App Engine
This is Rietveld 408576698