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

Unified Diff: ash/wallpaper/wallpaper_widget_controller.h

Issue 2908333003: [mus+ash] Removes WmWindow from ash (app_list, frame, metrics, session, system, wallpaper) (Closed)
Patch Set: [mus ash] Removes WmWindow from ash (rebase, nits and cleanup of use of ResizeHandleWindowTargeter) Created 3 years, 7 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/wallpaper/wallpaper_controller_unittest.cc ('k') | ash/wallpaper/wallpaper_widget_controller.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: ash/wallpaper/wallpaper_widget_controller.h
diff --git a/ash/wallpaper/wallpaper_widget_controller.h b/ash/wallpaper/wallpaper_widget_controller.h
index a1a61a3076150e672e2499e64714772666d903f6..1c379ee9c1b7c94ac7ee1ac483fafed055a323cf 100644
--- a/ash/wallpaper/wallpaper_widget_controller.h
+++ b/ash/wallpaper/wallpaper_widget_controller.h
@@ -15,7 +15,6 @@
namespace ash {
class RootWindowController;
-class WmWindow;
// This class implements a widget-based wallpaper.
// WallpaperWidgetController is owned by RootWindowController.
@@ -36,7 +35,7 @@ class ASH_EXPORT WallpaperWidgetController : public views::WidgetObserver,
// Move the wallpaper for |root_window| to the specified |container|.
// The lock screen moves the wallpaper container to hides the user's windows.
// Returns true if there was something to reparent.
- bool Reparent(WmWindow* root_window, int container);
+ bool Reparent(aura::Window* root_window, int container);
// Starts wallpaper fade in animation. |root_window_controller| is
// the root window where the animation will happen. (This is
@@ -56,7 +55,7 @@ class ASH_EXPORT WallpaperWidgetController : public views::WidgetObserver,
views::Widget* widget_;
// Parent of |widget_|.
- WmWindow* widget_parent_;
+ aura::Window* widget_parent_;
DISALLOW_COPY_AND_ASSIGN(WallpaperWidgetController);
};
« no previous file with comments | « ash/wallpaper/wallpaper_controller_unittest.cc ('k') | ash/wallpaper/wallpaper_widget_controller.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698