Remove PerBrowser launcher, reland step 1 of 2

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..5ed3c6c5c99a9cfd12a872e7a2a79fd1d140cdb1 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
@@ -10,7 +10,6 @@
 #include "ash/wm/window_util.h"
 #include "chrome/browser/ui/ash/launcher/chrome_launcher_app_menu_item.h"
 #include "chrome/browser/ui/ash/launcher/chrome_launcher_app_menu_item_v2app.h"
-#include "chrome/browser/ui/ash/launcher/chrome_launcher_controller.h"
 #include "chrome/browser/ui/ash/launcher/chrome_launcher_controller_per_app.h"
 #include "chrome/browser/ui/ash/launcher/launcher_item_controller.h"
 #include "content/public/browser/web_contents.h"
@@ -155,8 +154,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 +166,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 +190,7 @@ ShellWindowLauncherItemController::GetApplicationList(int event_flags) {
         shell_window->GetTitle(),
         image.get(),  // Will be copied
         app_id(),
-        launcher_controller()->GetPerAppInterface(),
+        launcher_controller(),
         index,
         index == 0 /* has_leading_separator */));
     ++index;