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

Unified Diff: ash/desktop_background/desktop_background_widget_controller.cc

Issue 2271373002: mash: Port mojo:ash_sysui's ContextMenuMus to mojo:ash. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Address comments Created 4 years, 4 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/desktop_background/desktop_background_view.cc ('k') | ash/desktop_background/user_wallpaper_delegate.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: ash/desktop_background/desktop_background_widget_controller.cc
diff --git a/ash/desktop_background/desktop_background_widget_controller.cc b/ash/desktop_background/desktop_background_widget_controller.cc
index 6aa1b81b3ac0b1388af220d8affc341fb06243f7..1e6d4615365537eb64ca1b88021371594e527db4 100644
--- a/ash/desktop_background/desktop_background_widget_controller.cc
+++ b/ash/desktop_background/desktop_background_widget_controller.cc
@@ -5,11 +5,11 @@
#include "ash/desktop_background/desktop_background_widget_controller.h"
#include "ash/ash_export.h"
+#include "ash/common/wallpaper/wallpaper_delegate.h"
#include "ash/common/wm_lookup.h"
+#include "ash/common/wm_shell.h"
#include "ash/common/wm_window.h"
-#include "ash/desktop_background/user_wallpaper_delegate.h"
#include "ash/root_window_controller.h"
-#include "ash/shell.h"
#include "ui/aura/window.h"
#include "ui/compositor/layer_animation_observer.h"
#include "ui/compositor/scoped_layer_animation_settings.h"
@@ -125,9 +125,8 @@ void DesktopBackgroundWidgetController::StartAnimating(
ui::ScopedLayerAnimationSettings settings(
widget_->GetNativeView()->layer()->GetAnimator());
settings.AddObserver(new ShowWallpaperAnimationObserver(
- root_window_controller, widget_, Shell::GetInstance()
- ->user_wallpaper_delegate()
- ->ShouldShowInitialAnimation()));
+ root_window_controller, widget_,
+ WmShell::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/desktop_background/desktop_background_view.cc ('k') | ash/desktop_background/user_wallpaper_delegate.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698