Initial crack at new workspace behavior. Each workspace now has its

ash/shell/window_watcher.h

Index: ash/shell/window_watcher.h
diff --git a/ash/shell/window_watcher.h b/ash/shell/window_watcher.h
index 42c7cdc3c76237d959040653fb89a6da7fb2cd09..ee81b5aa8e7826584bc2d2906c87b05647dcd669 100644
--- a/ash/shell/window_watcher.h
+++ b/ash/shell/window_watcher.h
@@ -10,6 +10,7 @@
 #include "ash/launcher/launcher_types.h"
 #include "base/compiler_specific.h"
 #include "base/logging.h"
+#include "base/memory/scoped_ptr.h"
 #include "ui/aura/window_observer.h"
 
 namespace aura {
@@ -19,6 +20,8 @@ class Window;
 namespace ash {
 namespace shell {
 
+// TODO(sky): fix this class, its a bit broke with workspace2.
+
 // WindowWatcher is responsible for listening for newly created windows and
 // creating items on the Launcher for them.
 class WindowWatcher : public aura::WindowObserver {
@@ -34,6 +37,8 @@ class WindowWatcher : public aura::WindowObserver {
   virtual void OnWillRemoveWindow(aura::Window* window) OVERRIDE;
 
  private:
+  class WorkspaceWindowWatcher;
+
   typedef std::map<ash::LauncherID, aura::Window*> IDToWindow;
 
   // Window watching for newly created windows to be added to.
@@ -44,6 +49,8 @@ class WindowWatcher : public aura::WindowObserver {
   // Maps from window to the id we gave it.
   IDToWindow id_to_window_;
 
+  scoped_ptr<WorkspaceWindowWatcher> workspace_window_watcher_;
+
   DISALLOW_COPY_AND_ASSIGN(WindowWatcher);
 };