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

Issues Search
    My Issues | Starred     Open | Closed | All

Unified Diff: ash/common/wallpaper/wallpaper_view.cc

Issue 2761373002: Move yet more 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/test/test_system_tray_delegate.cc ('k') | ash/common/wm/container_finder.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: ash/common/wallpaper/wallpaper_view.cc
diff --git a/ash/common/wallpaper/wallpaper_view.cc b/ash/common/wallpaper/wallpaper_view.cc
index 14345c09821915098ba94a3f190cb62e3429345b..843f95ac7f86c5c4bcd1f37a5487c08a16058f10 100644
--- a/ash/common/wallpaper/wallpaper_view.cc
+++ b/ash/common/wallpaper/wallpaper_view.cc
@@ -222,7 +222,7 @@ views::Widget* CreateWallpaper(WmWindow* root_window, int container_id) {
// 4. From an empty background, guest user logged in.
if (wallpaper_delegate->ShouldShowInitialAnimation() ||
root_window_controller->animating_wallpaper_widget_controller() ||
- WmShell::Get()->session_controller()->NumberOfLoggedInUsers()) {
+ Shell::Get()->session_controller()->NumberOfLoggedInUsers()) {
wallpaper_window->SetVisibilityAnimationTransition(::wm::ANIMATE_SHOW);
int duration_override = wallpaper_delegate->GetAnimationDurationOverride();
if (duration_override) {
« no previous file with comments | « ash/common/test/test_system_tray_delegate.cc ('k') | ash/common/wm/container_finder.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698