Remove stops_event_propagation from Window, since it's broken.

ash/shell/shell_main.cc

Index: ash/shell/shell_main.cc
===================================================================
--- ash/shell/shell_main.cc	(revision 128508)
+++ ash/shell/shell_main.cc	(working copy)
@@ -12,16 +12,14 @@
 #include "ash/shell_delegate.h"
 #include "ash/shell_factory.h"
 #include "ash/shell_window_ids.h"
-#include "ash/shell/example_factory.h"
-#include "ash/shell/toplevel_window.h"
+#include "ash/shell/launcher_delegate_impl.h"
+#include "ash/shell/shell_delegate_impl.h"
 #include "ash/shell/shell_main_parts.h"
-#include "ash/wm/partial_screenshot_view.h"
-#include "ash/wm/window_util.h"
+#include "ash/shell/window_watcher.h"
 #include "base/at_exit.h"
 #include "base/command_line.h"
 #include "base/memory/scoped_ptr.h"
 #include "base/message_loop.h"
-#include "grit/ui_resources.h"
 #include "ui/aura/env.h"
 #include "ui/aura/client/window_types.h"
 #include "ui/aura/root_window.h"
@@ -55,198 +53,6 @@
   DISALLOW_COPY_AND_ASSIGN(ShellViewsDelegate);
 };
 
-// WindowWatcher is responsible for listening for newly created windows and
-// creating items on the Launcher for them.
-class WindowWatcher : public aura::WindowObserver {
- public:
-  WindowWatcher()
-      : window_(ash::Shell::GetInstance()->launcher()->window_container()) {
-    window_->AddObserver(this);
-  }
-
-  virtual ~WindowWatcher() {
-    window_->RemoveObserver(this);
-  }
-
-  aura::Window* GetWindowByID(ash::LauncherID id) {
-    IDToWindow::const_iterator i = id_to_window_.find(id);
-    return i != id_to_window_.end() ? i->second : NULL;
-  }
-
-  ash::LauncherID GetIDByWindow(aura::Window* window) const {
-    for (IDToWindow::const_iterator i = id_to_window_.begin();
-         i != id_to_window_.end(); ++i) {
-      if (i->second == window)
-        return i->first;
-    }
-    return 0;  // TODO: add a constant for this.
-  }
-
-  // aura::WindowObserver overrides:
-  virtual void OnWindowAdded(aura::Window* new_window) OVERRIDE {
-    if (new_window->type() != aura::client::WINDOW_TYPE_NORMAL)
-      return;
-
-    static int image_count = 0;
-    ash::LauncherModel* model = ash::Shell::GetInstance()->launcher()->model();
-    ash::LauncherItem item;
-    item.type = ash::TYPE_TABBED;
-    id_to_window_[model->next_id()] = new_window;
-    item.num_tabs = image_count + 1;
-    item.image.setConfig(SkBitmap::kARGB_8888_Config, 16, 16);
-    item.image.allocPixels();
-    item.image.eraseARGB(255,
-                         image_count == 0 ? 255 : 0,
-                         image_count == 1 ? 255 : 0,
-                         image_count == 2 ? 255 : 0);
-    image_count = (image_count + 1) % 3;
-    model->Add(model->item_count(), item);
-  }
-
-  virtual void OnWillRemoveWindow(aura::Window* window) OVERRIDE {
-    for (IDToWindow::iterator i = id_to_window_.begin();
-         i != id_to_window_.end(); ++i) {
-      if (i->second == window) {
-        ash::LauncherModel* model =
-            ash::Shell::GetInstance()->launcher()->model();
-        int index = model->ItemIndexByID(i->first);
-        DCHECK_NE(-1, index);
-        model->RemoveItemAt(index);
-        id_to_window_.erase(i);
-        break;
-      }
-    }
-  }
-
- private:
-  typedef std::map<ash::LauncherID, aura::Window*> IDToWindow;
-
-  // Window watching for newly created windows to be added to.
-  aura::Window* window_;
-
-  // Maps from window to the id we gave it.
-  IDToWindow id_to_window_;
-
-  DISALLOW_COPY_AND_ASSIGN(WindowWatcher);
-};
-
-class LauncherDelegateImpl : public ash::LauncherDelegate {
- public:
-  explicit LauncherDelegateImpl(WindowWatcher* watcher)
-      : watcher_(watcher) {
-  }
-
-  void set_watcher(WindowWatcher* watcher) { watcher_ = watcher; }
-
-  // LauncherDelegate overrides:
-  virtual void CreateNewWindow() OVERRIDE {
-    ash::shell::ToplevelWindow::CreateParams create_params;
-    create_params.can_resize = true;
-    create_params.can_maximize = true;
-    ash::shell::ToplevelWindow::CreateToplevelWindow(create_params);
-  }
-
-  virtual void ItemClicked(const ash::LauncherItem& item) OVERRIDE {
-    aura::Window* window = watcher_->GetWindowByID(item.id);
-    window->Show();
-    ash::wm::ActivateWindow(window);
-  }
-
-  virtual int GetBrowserShortcutResourceId() OVERRIDE {
-    return IDR_AURA_LAUNCHER_BROWSER_SHORTCUT;
-  }
-
-  virtual string16 GetTitle(const ash::LauncherItem& item) OVERRIDE {
-    return watcher_->GetWindowByID(item.id)->title();
-  }
-
-  virtual ui::MenuModel* CreateContextMenu(
-      const ash::LauncherItem& item) OVERRIDE {
-    return NULL;
-  }
-
-  virtual ash::LauncherID GetIDByWindow(aura::Window* window) OVERRIDE {
-    return watcher_->GetIDByWindow(window);
-  }
-
- private:
-  // Used to update Launcher. Owned by main.
-  WindowWatcher* watcher_;
-
-  DISALLOW_COPY_AND_ASSIGN(LauncherDelegateImpl);
-};
-
-class ShellDelegateImpl : public ash::ShellDelegate {
- public:
-  ShellDelegateImpl() : watcher_(NULL), launcher_delegate_(NULL) {}
-
-  void SetWatcher(WindowWatcher* watcher) {
-    watcher_ = watcher;
-    if (launcher_delegate_)
-      launcher_delegate_->set_watcher(watcher);
-  }
-
-  virtual views::Widget* CreateStatusArea() OVERRIDE {
-    return NULL;
-  }
-
-  virtual bool CanCreateLauncher() OVERRIDE {
-    return true;
-  }
-
-#if defined(OS_CHROMEOS)
-  virtual void LockScreen() OVERRIDE {
-    ash::shell::CreateLockScreen();
-  }
-#endif
-
-  virtual void Exit() OVERRIDE {
-    MessageLoopForUI::current()->Quit();
-  }
-
-  virtual ash::AppListViewDelegate* CreateAppListViewDelegate() OVERRIDE {
-    return ash::shell::CreateAppListViewDelegate();
-  }
-
-  std::vector<aura::Window*> GetCycleWindowList(
-      CycleSource source) const OVERRIDE {
-    aura::Window* default_container = ash::Shell::GetInstance()->GetContainer(
-        ash::internal::kShellWindowId_DefaultContainer);
-    std::vector<aura::Window*> windows = default_container->children();
-    // Window cycling expects the topmost window at the front of the list.
-    std::reverse(windows.begin(), windows.end());
-    return windows;
-  }
-
-  virtual void StartPartialScreenshot(
-      ash::ScreenshotDelegate* screenshot_delegate) OVERRIDE {
-    ash::PartialScreenshotView::StartPartialScreenshot(screenshot_delegate);
-  }
-
-  virtual ash::LauncherDelegate* CreateLauncherDelegate(
-      ash::LauncherModel* model) OVERRIDE {
-    launcher_delegate_ = new LauncherDelegateImpl(watcher_);
-    return launcher_delegate_;
-  }
-
-  virtual ash::SystemTrayDelegate* CreateSystemTrayDelegate(
-      ash::SystemTray* tray) {
-    return NULL;
-  }
-
-  virtual ash::UserWallpaperDelegate* CreateUserWallpaperDelegate() {
-    return NULL;
-  }
-
- private:
-  // Used to update Launcher. Owned by main.
-  WindowWatcher* watcher_;
-
-  LauncherDelegateImpl* launcher_delegate_;
-
-  DISALLOW_COPY_AND_ASSIGN(ShellDelegateImpl);
-};
-
 }  // namespace
 
 namespace ash {
@@ -273,10 +79,11 @@
   if (!views::ViewsDelegate::views_delegate)
     views::ViewsDelegate::views_delegate = new ShellViewsDelegate;
 
-  ShellDelegateImpl* delegate = new ShellDelegateImpl;
+  ash::shell::ShellDelegateImpl* delegate = new ash::shell::ShellDelegateImpl;
   ash::Shell::CreateInstance(delegate);
 
-  scoped_ptr<WindowWatcher> window_watcher(new WindowWatcher);
+  scoped_ptr<ash::shell::WindowWatcher> window_watcher(
+      new ash::shell::WindowWatcher);
   delegate->SetWatcher(window_watcher.get());
 
   ash::shell::InitWindowTypeLauncher();