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

Unified Diff: ash/aura/wm_root_window_controller_aura.cc

Issue 2318223003: mash: Migrate wallpaper controllers to ash/common. (Closed)
Patch Set: Fix nit. 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
« no previous file with comments | « ash/aura/wm_root_window_controller_aura.h ('k') | ash/common/accelerators/accelerator_controller.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
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..7217ba22d53a8c6b560d17df0e5170f9cf283acf 100644
--- a/ash/aura/wm_root_window_controller_aura.cc
+++ b/ash/aura/wm_root_window_controller_aura.cc
@@ -107,4 +107,15 @@ gfx::Point WmRootWindowControllerAura::GetLastMouseLocationInRoot() {
->GetLastMouseLocationInRoot();
}
+void WmRootWindowControllerAura::OnInitialWallpaperAnimationStarted() {
+ root_window_controller_->OnInitialWallpaperAnimationStarted();
+ WmRootWindowController::OnInitialWallpaperAnimationStarted();
+}
+
+void WmRootWindowControllerAura::OnWallpaperAnimationFinished(
+ views::Widget* widget) {
+ root_window_controller_->OnWallpaperAnimationFinished(widget);
+ WmRootWindowController::OnWallpaperAnimationFinished(widget);
+}
+
} // namespace ash
« no previous file with comments | « ash/aura/wm_root_window_controller_aura.h ('k') | ash/common/accelerators/accelerator_controller.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698