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

Unified Diff: ash/default_wallpaper_delegate.cc

Issue 2738133003: Promotes a handful of members from WmShell to Shell (Closed)
Patch Set: merge 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/wm_shell.cc ('k') | ash/magnifier/magnification_controller.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: ash/default_wallpaper_delegate.cc
diff --git a/ash/default_wallpaper_delegate.cc b/ash/default_wallpaper_delegate.cc
index 1e78a74a786948c013b9ad56a10fcc4ed79027f9..48c28b48a97c0bd2aceb87151965d7910fe7f087 100644
--- a/ash/default_wallpaper_delegate.cc
+++ b/ash/default_wallpaper_delegate.cc
@@ -5,7 +5,7 @@
#include "ash/default_wallpaper_delegate.h"
#include "ash/common/wallpaper/wallpaper_controller.h"
-#include "ash/common/wm_shell.h"
+#include "ash/shell.h"
#include "ui/wm/core/window_animations.h"
namespace ash {
@@ -28,7 +28,7 @@ bool DefaultWallpaperDelegate::ShouldShowInitialAnimation() {
void DefaultWallpaperDelegate::UpdateWallpaper(bool clear_cache) {}
void DefaultWallpaperDelegate::InitializeWallpaper() {
- WmShell::Get()->wallpaper_controller()->CreateEmptyWallpaper();
+ Shell::GetInstance()->wallpaper_controller()->CreateEmptyWallpaper();
}
bool DefaultWallpaperDelegate::CanOpenSetWallpaperPage() {
« no previous file with comments | « ash/common/wm_shell.cc ('k') | ash/magnifier/magnification_controller.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698