Revert 226547 "Refactor LauncherItemController and LauncherItemD..."

trunk/src/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/display/display_controller.h"
 #include "ash/launcher/launcher.h"
-#include "ash/launcher/launcher_item_delegate_manager.h"
 #include "ash/launcher/launcher_model.h"
 #include "ash/shelf/shelf_widget.h"
 #include "ash/shell.h"
-#include "ash/shell/window_watcher_launcher_item_delegate.h"
 #include "ash/shell_window_ids.h"
 #include "ui/aura/root_window.h"
 #include "ui/aura/window.h"
 #include "ui/gfx/display.h"
 
 namespace ash {
 namespace shell {
 
 class WindowWatcher::WorkspaceWindowWatcher : public aura::WindowObserver {
  public:
@@ skipping 79 matching lines @@
 void WindowWatcher::OnWindowAdded(aura::Window* new_window) {
   if (new_window->type() != aura::client::WINDOW_TYPE_NORMAL &&
       new_window->type() != aura::client::WINDOW_TYPE_PANEL)
     return;
 
   static int image_count = 0;
   ash::LauncherModel* model = Shell::GetInstance()->launcher_model();
   ash::LauncherItem item;
   item.type = new_window->type() == aura::client::WINDOW_TYPE_PANEL ?
       ash::TYPE_APP_PANEL : ash::TYPE_PLATFORM_APP;
-  ash::LauncherID id = model->next_id();
-  id_to_window_[id] = new_window;
+  id_to_window_[model->next_id()] = new_window;
 
   SkBitmap icon_bitmap;
   icon_bitmap.setConfig(SkBitmap::kARGB_8888_Config, 16, 16);
   icon_bitmap.allocPixels();
   icon_bitmap.eraseARGB(255,
                         image_count == 0 ? 255 : 0,
                         image_count == 1 ? 255 : 0,
                         image_count == 2 ? 255 : 0);
   image_count = (image_count + 1) % 3;
   item.image = gfx::ImageSkia(gfx::ImageSkiaRep(icon_bitmap, 1.0f));
 
   model->Add(item);
-
-  ash::LauncherItemDelegateManager* manager =
-      ash::Shell::GetInstance()->launcher_item_delegate_manager();
-  scoped_ptr<LauncherItemDelegate> delegate(
-      new WindowWatcherLauncherItemDelegate(id, this));
-  manager->SetLauncherItemDelegate(id, delegate.Pass());
 }
 
 void WindowWatcher::OnWillRemoveWindow(aura::Window* window) {
   for (IDToWindow::iterator i = id_to_window_.begin();
        i != id_to_window_.end(); ++i) {
     if (i->second == window) {
       ash::LauncherModel* model = Shell::GetInstance()->launcher_model();
       int index = model->ItemIndexByID(i->first);
       DCHECK_NE(-1, index);
       model->RemoveItemAt(index);
@@ skipping 12 matching lines @@
   workspace_window_watcher_->RootWindowAdded(root);
 }
 
 void WindowWatcher::OnDisplayRemoved(const gfx::Display& old_display) {
   // All windows in the display has already been removed, so no need to
   // remove observers.
 }
 
 }  // namespace shell
 }  // namespace ash