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

Unified Diff: ash/aura/wm_root_window_controller_aura.cc

Issue 2318223003: mash: Migrate wallpaper controllers to ash/common. (Closed)
Patch Set: Cleanup. Created 4 years, 3 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
Index: ash/aura/wm_root_window_controller_aura.cc
diff --git a/ash/aura/wm_root_window_controller_aura.cc b/ash/aura/wm_root_window_controller_aura.cc
index 2fedcf45849ef82f42f5dd0cd8cf89e1d6d75069..acefae32e1cecd7c73cd0d915772a6c1bd5d9fe9 100644
--- a/ash/aura/wm_root_window_controller_aura.cc
+++ b/ash/aura/wm_root_window_controller_aura.cc
@@ -107,4 +107,14 @@ gfx::Point WmRootWindowControllerAura::GetLastMouseLocationInRoot() {
->GetLastMouseLocationInRoot();
}
+void WmRootWindowControllerAura::OnInitialWallpaperAnimationStarted() {
+ root_window_controller_->OnInitialWallpaperAnimationStarted();
+}
James Cook 2016/09/07 21:27:05 optional: call the base class here?
msw 2016/09/07 22:28:24 Done.
+
+void WmRootWindowControllerAura::OnWallpaperAnimationFinished(
+ views::Widget* widget) {
+ root_window_controller_->OnWallpaperAnimationFinished(widget);
+ WmRootWindowController::OnWallpaperAnimationFinished(widget);
+}
+
} // namespace ash

Powered by Google App Engine
This is Rietveld 408576698