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

Unified Diff: ash/common/wallpaper/wallpaper_controller.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/system/user/user_view.cc ('k') | ash/common/wallpaper/wallpaper_controller_unittest.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: ash/common/wallpaper/wallpaper_controller.cc
diff --git a/ash/common/wallpaper/wallpaper_controller.cc b/ash/common/wallpaper/wallpaper_controller.cc
index 8c1420afdf54986f6586160148d7bf087aaa2ec2..ac101323d0771a9614bb94ec53e1ed7582976db7 100644
--- a/ash/common/wallpaper/wallpaper_controller.cc
+++ b/ash/common/wallpaper/wallpaper_controller.cc
@@ -234,7 +234,7 @@ bool WallpaperController::WallpaperIsAlreadyLoaded(
void WallpaperController::OpenSetWallpaperPage() {
if (wallpaper_picker_ &&
- WmShell::Get()->wallpaper_delegate()->CanOpenSetWallpaperPage()) {
+ Shell::Get()->wallpaper_delegate()->CanOpenSetWallpaperPage()) {
wallpaper_picker_->Open();
}
}
@@ -326,7 +326,7 @@ int WallpaperController::GetWallpaperContainerId(bool locked) {
void WallpaperController::UpdateWallpaper(bool clear_cache) {
current_wallpaper_.reset();
- WmShell::Get()->wallpaper_delegate()->UpdateWallpaper(clear_cache);
+ Shell::Get()->wallpaper_delegate()->UpdateWallpaper(clear_cache);
}
void WallpaperController::SetProminentColor(SkColor color) {
« no previous file with comments | « ash/common/system/user/user_view.cc ('k') | ash/common/wallpaper/wallpaper_controller_unittest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698