Remove PerBrowser launcher

chrome/browser/ui/ash/launcher/shell_window_launcher_item_controller.cc

Index: chrome/browser/ui/ash/launcher/shell_window_launcher_item_controller.cc
diff --git a/chrome/browser/ui/ash/launcher/shell_window_launcher_item_controller.cc b/chrome/browser/ui/ash/launcher/shell_window_launcher_item_controller.cc
index b4d562d857635f295b81fa10419675417df78a1d..fd1b3bb4377b3185a70abb5cadca23417d9d0304 100644
--- a/chrome/browser/ui/ash/launcher/shell_window_launcher_item_controller.cc
+++ b/chrome/browser/ui/ash/launcher/shell_window_launcher_item_controller.cc
@@ -155,8 +155,7 @@ void ShellWindowLauncherItemController::Clicked(const ui::Event& event) {
     } else {
       ShowAndActivateOrMinimize(panel);
     }
-  } else if (launcher_controller()->GetPerAppInterface() ||
-      shell_windows_.size() == 1) {
+  } else {
     ShellWindow* window_to_show = last_active_shell_window_ ?
         last_active_shell_window_ : shell_windows_.front();
     // If the event was triggered by a keystroke, we try to advance to the next
@@ -168,20 +167,6 @@ void ShellWindowLauncherItemController::Clicked(const ui::Event& event) {
     } else {
       ShowAndActivateOrMinimize(window_to_show);
     }
-  } else {
-    // TODO(stevenjb): Deprecate
-    if (!last_active_shell_window_ ||
-        last_active_shell_window_->GetBaseWindow()->IsActive()) {
-      // Restore all windows since there is no other way to restore them.
-      for (ShellWindowList::iterator iter = shell_windows_.begin();
-           iter != shell_windows_.end(); ++iter) {
-        ShellWindow* shell_window = *iter;
-        if (shell_window->GetBaseWindow()->IsMinimized())
-          shell_window->GetBaseWindow()->Restore();
-      }
-    }
-    if (last_active_shell_window_)
-      ShowAndActivateOrMinimize(last_active_shell_window_);
   }
 }
 
@@ -206,7 +191,7 @@ ShellWindowLauncherItemController::GetApplicationList(int event_flags) {
         shell_window->GetTitle(),
         image.get(),  // Will be copied
         app_id(),
-        launcher_controller()->GetPerAppInterface(),
+        static_cast<ChromeLauncherControllerPerApp*>(launcher_controller()),

[Mr4D (OOO till 08-26), 2013/08/16 22:43:22]

This static_cast should not be needed anymore with the renaming of the
controller class.

[simonhong_, 2013/08/19 05:26:11]

Done.

         index,
         index == 0 /* has_leading_separator */));
     ++index;