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

Unified Diff: ash/common/wallpaper/wallpaper_widget_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/wallpaper/wallpaper_view.cc ('k') | ash/common/wm/focus_rules.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: ash/common/wallpaper/wallpaper_widget_controller.cc
diff --git a/ash/common/wallpaper/wallpaper_widget_controller.cc b/ash/common/wallpaper/wallpaper_widget_controller.cc
index 506cea9d4e0be1e987a95edd62d60e6de02e00a9..32a537bb85d0a563375856e3fc64ea708f4c1bc2 100644
--- a/ash/common/wallpaper/wallpaper_widget_controller.cc
+++ b/ash/common/wallpaper/wallpaper_widget_controller.cc
@@ -6,9 +6,9 @@
#include "ash/ash_export.h"
#include "ash/common/wallpaper/wallpaper_delegate.h"
-#include "ash/common/wm_shell.h"
#include "ash/common/wm_window.h"
#include "ash/root_window_controller.h"
+#include "ash/shell.h"
#include "ui/compositor/layer_animation_observer.h"
#include "ui/compositor/scoped_layer_animation_settings.h"
#include "ui/views/widget/widget.h"
@@ -119,7 +119,7 @@ void WallpaperWidgetController::StartAnimating(
widget_->GetLayer()->GetAnimator());
settings.AddObserver(new ShowWallpaperAnimationObserver(
root_window_controller, widget_,
- WmShell::Get()->wallpaper_delegate()->ShouldShowInitialAnimation()));
+ Shell::Get()->wallpaper_delegate()->ShouldShowInitialAnimation()));
// When |widget_| shows, AnimateShowWindowCommon() is called to do the
// animation. Sets transition duration to 0 to avoid animating to the
// show animation's initial values.
« no previous file with comments | « ash/common/wallpaper/wallpaper_view.cc ('k') | ash/common/wm/focus_rules.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698