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); |
}; |