Remove PerBrowser launcher

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

Index: chrome/browser/ui/ash/launcher/chrome_launcher_controller.cc
diff --git a/chrome/browser/ui/ash/launcher/chrome_launcher_controller.cc b/chrome/browser/ui/ash/launcher/chrome_launcher_controller.cc
index 442f2e83c1abc8272e9877722f593d6fd6a78de7..b7ce1144be4472e59e12e37b6a3768dcd1232909 100644
--- a/chrome/browser/ui/ash/launcher/chrome_launcher_controller.cc
+++ b/chrome/browser/ui/ash/launcher/chrome_launcher_controller.cc
@@ -4,10 +4,7 @@
 
 #include "chrome/browser/ui/ash/launcher/chrome_launcher_controller.h"
 
-#include "ash/ash_switches.h"
-#include "base/command_line.h"
 #include "chrome/browser/ui/ash/launcher/chrome_launcher_controller_per_app.h"
-#include "chrome/browser/ui/ash/launcher/chrome_launcher_controller_per_browser.h"
 
 // statics
 ChromeLauncherController* ChromeLauncherController::instance_ = NULL;
@@ -19,11 +16,7 @@ ChromeLauncherController* ChromeLauncherController::CreateInstance(
   // We do not check here for re-creation of the ChromeLauncherController since
   // it appears that it might be intentional that the ChromeLauncherController
   // can be re-created.
-  if (!CommandLine::ForCurrentProcess()->HasSwitch(
-          ash::switches::kAshDisablePerAppLauncher))
-    instance_ = new ChromeLauncherControllerPerApp(profile, model);
-  else
-    instance_ = new ChromeLauncherControllerPerBrowser(profile, model);
+  instance_ = new ChromeLauncherControllerPerApp(profile, model);
   return instance_;
 }
 
@@ -31,9 +24,3 @@ ChromeLauncherController::~ChromeLauncherController() {
   if (instance_ == this)
     instance_ = NULL;
 }
-
-bool ChromeLauncherController::IsPerAppLauncher() {
-  if (!instance_)
-    return false;
-  return instance_->GetPerAppInterface() != NULL;
-}