Revert 226547 "Refactor LauncherItemController and LauncherItemD..."

trunk/src/chrome/browser/ui/ash/launcher/shell_window_launcher_controller.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 "chrome/browser/ui/ash/launcher/shell_window_launcher_controller.h"
 
 #include "apps/shell_window.h"
 #include "ash/shell.h"
 #include "ash/wm/window_util.h"
+#include "base/stl_util.h"
 #include "base/strings/stringprintf.h"
 #include "chrome/browser/profiles/profile.h"
 #include "chrome/browser/ui/ash/launcher/chrome_launcher_controller.h"
 #include "chrome/browser/ui/ash/launcher/shell_window_launcher_item_controller.h"
 #include "ui/aura/client/activation_client.h"
 
 using apps::ShellWindow;
 
 namespace {
 
@@ skipping 14 matching lines @@
   if (ash::Shell::HasInstance()) {
     if (ash::Shell::GetInstance()->GetPrimaryRootWindow()) {
       activation_client_ = aura::client::GetActivationClient(
           ash::Shell::GetInstance()->GetPrimaryRootWindow());
       if (activation_client_)
         activation_client_->AddObserver(this);
     }
   }
 }
 
+
 ShellWindowLauncherController::~ShellWindowLauncherController() {
   registry_->RemoveObserver(this);
   if (activation_client_)
     activation_client_->RemoveObserver(this);
   for (WindowToAppLauncherIdMap::iterator iter =
            window_to_app_launcher_id_map_.begin();
        iter != window_to_app_launcher_id_map_.end(); ++iter) {
     iter->first->RemoveObserver(this);
   }
+  STLDeleteContainerPairSecondPointers(
+      app_controller_map_.begin(), app_controller_map_.end());
 }
 
 void ShellWindowLauncherController::OnShellWindowAdded(
     ShellWindow* shell_window) {
   aura::Window* window = shell_window->GetNativeWindow();
   // Get the app's launcher identifier and add an entry to the map.
   DCHECK(window_to_app_launcher_id_map_.find(window) ==
          window_to_app_launcher_id_map_.end());
   const std::string app_launcher_id = GetAppLauncherId(shell_window);
   window_to_app_launcher_id_map_[window] = app_launcher_id;
@@ skipping 64 matching lines @@
   AppControllerMap::iterator iter2 = app_controller_map_.find(app_launcher_id);
   DCHECK(iter2 != app_controller_map_.end());
   ShellWindowLauncherItemController* controller = iter2->second;
   controller->RemoveShellWindowForWindow(window);
   if (controller->shell_window_count() == 0) {
     // If this is the last window associated with the app launcher id, close the
     // launcher item.
     ash::LauncherID launcher_id = controller->launcher_id();
     owner_->CloseLauncherItem(launcher_id);
     app_controller_map_.erase(iter2);
+    delete controller;
   }
 }
 
 void ShellWindowLauncherController::OnWindowActivated(
     aura::Window* new_active,
     aura::Window* old_active) {
   // Make the newly active window the active (first) entry in the controller.
   ShellWindowLauncherItemController* new_controller =
       ControllerForWindow(new_active);
   if (new_controller) {
@@ skipping 16 matching lines @@
   WindowToAppLauncherIdMap::iterator iter1 =
       window_to_app_launcher_id_map_.find(window);
   if (iter1 == window_to_app_launcher_id_map_.end())
     return NULL;
   std::string app_launcher_id = iter1->second;
   AppControllerMap::iterator iter2 = app_controller_map_.find(app_launcher_id);
   if (iter2 == app_controller_map_.end())
     return NULL;
   return iter2->second;
 }