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

Unified Diff: ash/common/wm_root_window_controller.h

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/common/wallpaper/wallpaper_widget_controller.cc ('k') | ash/common/wm_root_window_controller.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: ash/common/wm_root_window_controller.h
diff --git a/ash/common/wm_root_window_controller.h b/ash/common/wm_root_window_controller.h
index e190072a1199d91c16f1939975804278c3085ab5..cc979fac48bb7c1484bb0956d25ea1bd8c25250e 100644
--- a/ash/common/wm_root_window_controller.h
+++ b/ash/common/wm_root_window_controller.h
@@ -17,6 +17,8 @@ class Point;
namespace ash {
class AlwaysOnTopController;
+class AnimatingWallpaperWidgetController;
+class WallpaperWidgetController;
class WmShelf;
class WmShell;
class WmWindow;
@@ -36,6 +38,17 @@ class ASH_EXPORT WmRootWindowController {
return root_window_layout_manager_;
}
+ WallpaperWidgetController* wallpaper_widget_controller() {
+ return wallpaper_widget_controller_.get();
+ }
+ void SetWallpaperWidgetController(WallpaperWidgetController* controller);
+
+ AnimatingWallpaperWidgetController* animating_wallpaper_widget_controller() {
+ return animating_wallpaper_widget_controller_.get();
+ }
+ void SetAnimatingWallpaperWidgetController(
+ AnimatingWallpaperWidgetController* controller);
+
WorkspaceController* workspace_controller() {
return workspace_controller_.get();
}
@@ -71,6 +84,11 @@ class ASH_EXPORT WmRootWindowController {
// coordinates. This may return a point outside the root window's bounds.
virtual gfx::Point GetLastMouseLocationInRoot() = 0;
+ // Called when the wallpaper animation has started or finished.
+ // TODO: port remaining classic ash wallpaper functionality here.
+ virtual void OnInitialWallpaperAnimationStarted();
+ virtual void OnWallpaperAnimationFinished(views::Widget* widget);
+
protected:
// Creates the containers (WmWindows) used by the shell.
void CreateContainers();
@@ -85,6 +103,9 @@ class ASH_EXPORT WmRootWindowController {
wm::RootWindowLayoutManager* root_window_layout_manager_;
+ std::unique_ptr<WallpaperWidgetController> wallpaper_widget_controller_;
+ std::unique_ptr<AnimatingWallpaperWidgetController>
+ animating_wallpaper_widget_controller_;
std::unique_ptr<WorkspaceController> workspace_controller_;
DISALLOW_COPY_AND_ASSIGN(WmRootWindowController);
« no previous file with comments | « ash/common/wallpaper/wallpaper_widget_controller.cc ('k') | ash/common/wm_root_window_controller.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698