Add ActivationChangeObserver, replacing kRootWindowActiveWindowKey

BUG=123160
TEST=no functional change. all test must pass.

Review URL: https://chromiumcodereview.appspot.com/10500006

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@140340 0039d316-1c4b-4281-b951-d872f2087c98

1 files changed, 5 insertions, 6 deletions

diff --git a/ash/wm/workspace_controller.h b/ash/wm/workspace_controller.h
index fba7ac2..746a792 100644
--- a/ash/wm/workspace_controller.h
+++ b/ash/wm/workspace_controller.h
@@ -9,7 +9,7 @@
 #include "ash/ash_export.h"
 #include "base/basictypes.h"
 #include "base/memory/scoped_ptr.h"
-#include "ui/aura/window_observer.h"
+#include "ui/aura/client/activation_change_observer.h"
 
 namespace aura {
 class Window;
@@ -27,7 +27,7 @@ class WorkspaceManager;
 // various workspace pieces: WorkspaceManager, WorkspaceLayoutManager and
 // WorkspaceEventFilter.
 class ASH_EXPORT WorkspaceController :
-      public aura::WindowObserver {
+    public aura::client::ActivationChangeObserver {
  public:
   explicit WorkspaceController(aura::Window* viewport);
   virtual ~WorkspaceController();
@@ -40,10 +40,9 @@ class ASH_EXPORT WorkspaceController :
   // Sets the size of the grid.
   void SetGridSize(int grid_size);
 
-  // aura::WindowObserver overrides:
-  virtual void OnWindowPropertyChanged(aura::Window* window,
-                                       const void* key,
-                                       intptr_t old) OVERRIDE;
+  // aura::client::ActivationChangeObserver overrides:
+  virtual void OnWindowActivated(aura::Window* window,
+                                 aura::Window* old_active) OVERRIDE;
 
  private:
   friend class WorkspaceControllerTestHelper;