Index: ui/aura_shell/workspace_controller.h |
=================================================================== |
--- ui/aura_shell/workspace_controller.h (revision 114022) |
+++ ui/aura_shell/workspace_controller.h (working copy) |
@@ -9,6 +9,7 @@ |
#include "base/basictypes.h" |
#include "base/memory/scoped_ptr.h" |
#include "ui/aura/root_window_observer.h" |
+#include "ui/aura/window_observer.h" |
#include "ui/aura_shell/aura_shell_export.h" |
#include "ui/aura_shell/launcher/launcher_model_observer.h" |
#include "ui/aura_shell/workspace/workspace_observer.h" |
@@ -33,6 +34,7 @@ |
// a move event between Laucher and Workspace. |
class AURA_SHELL_EXPORT WorkspaceController : |
public aura::RootWindowObserver, |
+ public aura::WindowObserver, |
public aura_shell::internal::WorkspaceObserver, |
public aura_shell::LauncherModelObserver { |
public: |
@@ -48,10 +50,14 @@ |
return workspace_manager_.get(); |
} |
- // RootWindowObserver overrides: |
+ // aura::RootWindowObserver overrides: |
virtual void OnRootWindowResized(const gfx::Size& new_size) OVERRIDE; |
- virtual void OnActiveWindowChanged(aura::Window* active) OVERRIDE; |
+ // aura::WindowObserver overrides: |
+ virtual void OnWindowPropertyChanged(aura::Window* window, |
+ const char* key, |
+ void* old) OVERRIDE; |
+ |
// WorkspaceObserver overrides: |
virtual void WindowMoved(WorkspaceManager* manager, |
aura::Window* source, |