Remove PerBrowser launcher

chrome/browser/ui/ash/launcher/chrome_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.

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

Close...
The "ChromeLauncherControllerPerApp" will become once again
"ChromeLauncherController"!

As such you should remove this file(!), move then
"Chrome_launcher_controller_per_app.cc" to "chrome_launcher_controller.cc" and
rename the class accordingly. Same with the header file.

Note: By moving we keep the history which would otherwise be lost.

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

Done.

 
 #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;
 
 // static
 ChromeLauncherController* ChromeLauncherController::CreateInstance(
     Profile* profile,
     ash::LauncherModel* model) {
   // 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_;
 }
 
 ChromeLauncherController::~ChromeLauncherController() {
   if (instance_ == this)
     instance_ = NULL;
 }
-
-bool ChromeLauncherController::IsPerAppLauncher() {
-  if (!instance_)
-    return false;
-  return instance_->GetPerAppInterface() != NULL;
-}