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

ash/shell/window_watcher.cc

 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "ash/shell/window_watcher.h"
 
 #include "ash/launcher/launcher.h"
 #include "ash/launcher/launcher_model.h"
 #include "ash/shell.h"
 #include "ash/shell_window_ids.h"
 #include "ui/aura/window.h"
 
 namespace ash {
 namespace shell {
 
+class WindowWatcher::WorkspaceWindowWatcher : public aura::WindowObserver {
+ public:
+  explicit WorkspaceWindowWatcher(WindowWatcher* watcher) : watcher_(watcher) {
+    watcher_->window_->AddObserver(this);
+    for (size_t i = 0; i < watcher_->window_->children().size(); ++i)
+      watcher_->window_->children()[i]->AddObserver(watcher_);
+  }
+
+  virtual ~WorkspaceWindowWatcher() {
+    watcher_->window_->RemoveObserver(this);
+    for (size_t i = 0; i < watcher_->window_->children().size(); ++i)
+      watcher_->window_->children()[i]->RemoveObserver(watcher_);
+  }
+
+  virtual void OnWindowAdded(aura::Window* new_window) OVERRIDE {
+    new_window->AddObserver(watcher_);
+  }
+
+  virtual void OnWillRemoveWindow(aura::Window* window) OVERRIDE {
+    DCHECK(window->children().empty());
+    window->RemoveObserver(watcher_);
+  }
+
+ private:
+  WindowWatcher* watcher_;
+
+  DISALLOW_COPY_AND_ASSIGN(WorkspaceWindowWatcher);
+};
+
 WindowWatcher::WindowWatcher()
     : window_(ash::Shell::GetInstance()->launcher()->window_container()),
       panel_container_(ash::Shell::GetContainer(
           Shell::GetPrimaryRootWindow(),
           internal::kShellWindowId_PanelContainer)) {
-  window_->AddObserver(this);
+  workspace_window_watcher_.reset(new WorkspaceWindowWatcher(this));
   panel_container_->AddObserver(this);
 }
 
 WindowWatcher::~WindowWatcher() {
-  window_->RemoveObserver(this);
   panel_container_->RemoveObserver(this);
 }
 
 aura::Window* WindowWatcher::GetWindowByID(ash::LauncherID id) {
   IDToWindow::const_iterator i = id_to_window_.find(id);
   return i != id_to_window_.end() ? i->second : NULL;
 }
 
 ash::LauncherID WindowWatcher::GetIDByWindow(aura::Window* window) const {
   for (IDToWindow::const_iterator i = id_to_window_.begin();
@@ skipping 40 matching lines @@
       DCHECK_NE(-1, index);
       model->RemoveItemAt(index);
       id_to_window_.erase(i);
       break;
     }
   }
 }
 
 }  // namespace shell
 }  // namespace ash