diff options
Diffstat (limited to 'ash/root_window_controller.h')
-rw-r--r-- | ash/root_window_controller.h | 22 |
1 files changed, 11 insertions, 11 deletions
diff --git a/ash/root_window_controller.h b/ash/root_window_controller.h index d347d81..ddf6355 100644 --- a/ash/root_window_controller.h +++ b/ash/root_window_controller.h @@ -28,16 +28,6 @@ namespace gfx { class Point; } -namespace views { -class Widget; - -namespace corewm { -class InputMethodEventFilter; -class RootWindowEventFilter; -class ScopedCaptureClient; -} -} - namespace keyboard { class KeyboardController; } @@ -46,6 +36,16 @@ namespace ui { class EventHandler; } +namespace views { +class Widget; +} + +namespace wm { +class InputMethodEventFilter; +class RootWindowEventFilter; +class ScopedCaptureClient; +} + namespace ash { class ShelfWidget; class StackingController; @@ -307,7 +307,7 @@ class ASH_EXPORT RootWindowController : public ShellObserver { scoped_ptr<DesktopBackgroundWidgetController> wallpaper_controller_; scoped_ptr<AnimatingDesktopController> animating_wallpaper_controller_; - scoped_ptr<views::corewm::ScopedCaptureClient> capture_client_; + scoped_ptr< ::wm::ScopedCaptureClient> capture_client_; DISALLOW_COPY_AND_ASSIGN(RootWindowController); }; |