Revert 114095 - Move the concept of Activation to the Shell.

ui/aura_shell/workspace_controller.h

Index: ui/aura_shell/workspace_controller.h
===================================================================
--- ui/aura_shell/workspace_controller.h	(revision 114099)
+++ ui/aura_shell/workspace_controller.h	(working copy)
@@ -9,7 +9,6 @@
 #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"
@@ -34,7 +33,6 @@
 // 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:
@@ -50,14 +48,10 @@
     return workspace_manager_.get();
   }
 
-  // aura::RootWindowObserver overrides:
+  // 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,
Property changes on: ui\aura_shell\workspace_controller.h
___________________________________________________________________
Added: svn:mergeinfo