Remove PerBrowser launcher

Remove per-browser.* and related tests.
Remove IsPerAppLauncher() interface in LauncherDelegate.
Remove ash-disable-per-app-launcher switch.
Change class name from ChromeLauncherControllerPerApp to ChromeLauncherController.

In the next CL, BrowserLauncherItemController will be replaced with new browser status monitor only for monitoring browser and tab status.

R=skuhne@chromium.org,jamescook@chromium.org
BUG=169303
TEST=unit_tests, browser_tests

Review URL: https://chromiumcodereview.appspot.com/22887015

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@218674 0039d316-1c4b-4281-b951-d872f2087c98

9 files changed, 2 insertions, 24 deletions

diff --git a/ash/ash_switches.cc b/ash/ash_switches.cc
index acb106f..c046bd1 100644
--- a/ash/ash_switches.cc
+++ b/ash/ash_switches.cc
@@ -66,9 +66,6 @@ const char kAshDisableDisplayChangeLimiter[] =
 // If present new lock animations are enabled.
 const char kAshDisableNewLockAnimations[] = "ash-disable-new-lock-animations";
 
-// Disable the per application grouping version of the launcher.
-const char kAshDisablePerAppLauncher[] = "ash-disable-per-app-launcher";
-
 // Disable immersive fullscreen mode, regardless of default setting.
 const char kAshDisableImmersiveFullscreen[] =
     "ash-disable-immersive-fullscreen";
diff --git a/ash/ash_switches.h b/ash/ash_switches.h
index 5fe137c..b86d3ff 100644
--- a/ash/ash_switches.h
+++ b/ash/ash_switches.h
@@ -34,7 +34,6 @@ ASH_EXPORT extern const char kAshDisableAutoWindowPlacement[];
 ASH_EXPORT extern const char kAshDisableDisplayChangeLimiter[];
 ASH_EXPORT extern const char kAshDisableImmersiveFullscreen[];
 ASH_EXPORT extern const char kAshDisableNewLockAnimations[];
-ASH_EXPORT extern const char kAshDisablePerAppLauncher[];
 ASH_EXPORT extern const char kAshDisableDragAndDropAppListToLauncher[];
 #if defined(OS_CHROMEOS)
 ASH_EXPORT extern const char kAshDisableSoftwareMirroring[];
diff --git a/ash/launcher/launcher.cc b/ash/launcher/launcher.cc
index 5bd1262..008646de 100644
--- a/ash/launcher/launcher.cc
+++ b/ash/launcher/launcher.cc
@@ -169,10 +169,7 @@ void Launcher::LaunchAppIndexAt(int item_index) {
   // There are two ways how found_index can be valid: a.) the nth item was
   // found (which is true when indexes_left is -1) or b.) the last item was
   // requested (which is true when index was passed in as a negative number).
-  if (found_index >= 0 && (indexes_left == -1 || item_index < 0) &&
-      (delegate_->IsPerAppLauncher() ||
-       (items[found_index].status == ash::STATUS_RUNNING ||
-        items[found_index].status == ash::STATUS_CLOSED))) {
+  if (found_index >= 0 && (indexes_left == -1 || item_index < 0)) {
     // Then set this one as active (or advance to the next item of its kind).
     ActivateLauncherItem(found_index);
   }
diff --git a/ash/launcher/launcher.h b/ash/launcher/launcher.h
index 6781058..c3acf44 100644
--- a/ash/launcher/launcher.h
+++ b/ash/launcher/launcher.h
@@ -101,8 +101,6 @@ class ASH_EXPORT Launcher {
   // TODO(sky): remove this!
   internal::LauncherView* GetLauncherViewForTest();
 
-  LauncherDelegate* delegate() { return delegate_; }
-
   ShelfWidget* shelf_widget() { return shelf_widget_; }
 
   // Set the bounds of the launcher view.
diff --git a/ash/launcher/launcher_delegate.h b/ash/launcher/launcher_delegate.h
index f835aac..322df38 100644
--- a/ash/launcher/launcher_delegate.h
+++ b/ash/launcher/launcher_delegate.h
@@ -46,7 +46,7 @@ class ASH_EXPORT LauncherDelegate {
   // and has an instance of |views::View| as the event target
   // but not |aura::Window|. If the |event| is of type KeyEvent, it is assumed
   // that this was triggered by keyboard action (Alt+<number>) and special
-  // handling might happen (PerApp launcher).
+  // handling might happen.
   virtual void ItemSelected(const LauncherItem& item,
                             const ui::Event& event) = 0;
 
@@ -92,9 +92,6 @@ class ASH_EXPORT LauncherDelegate {
   // exists.
   virtual void OnLauncherDestroyed(Launcher* launcher) = 0;
 
-  // True if the running launcher is the per application launcher.
-  virtual bool IsPerAppLauncher() = 0;
-
   // Get the launcher ID from an application ID.
   virtual LauncherID GetLauncherIDForAppID(const std::string& app_id) = 0;
 
diff --git a/ash/shell/launcher_delegate_impl.cc b/ash/shell/launcher_delegate_impl.cc
index 51f6171..ac0aeee 100644
--- a/ash/shell/launcher_delegate_impl.cc
+++ b/ash/shell/launcher_delegate_impl.cc
@@ -64,10 +64,6 @@ void LauncherDelegateImpl::OnLauncherCreated(Launcher* launcher) {
 void LauncherDelegateImpl::OnLauncherDestroyed(Launcher* launcher) {
 }
 
-bool LauncherDelegateImpl::IsPerAppLauncher() {
-  return false;
-}
-
 LauncherID LauncherDelegateImpl::GetLauncherIDForAppID(
     const std::string& app_id) {
   return 0;
diff --git a/ash/shell/launcher_delegate_impl.h b/ash/shell/launcher_delegate_impl.h
index 4788029..86a3579 100644
--- a/ash/shell/launcher_delegate_impl.h
+++ b/ash/shell/launcher_delegate_impl.h
@@ -39,7 +39,6 @@ class LauncherDelegateImpl : public ash::LauncherDelegate {
   virtual bool ShouldShowTooltip(const LauncherItem& item) OVERRIDE;
   virtual void OnLauncherCreated(Launcher* launcher) OVERRIDE;
   virtual void OnLauncherDestroyed(Launcher* launcher) OVERRIDE;
-  virtual bool IsPerAppLauncher() OVERRIDE;
   virtual LauncherID GetLauncherIDForAppID(const std::string& app_id) OVERRIDE;
   virtual void PinAppWithID(const std::string& app_id) OVERRIDE;
   virtual bool IsAppPinned(const std::string& app_id) OVERRIDE;
diff --git a/ash/test/test_launcher_delegate.cc b/ash/test/test_launcher_delegate.cc
index 0830d32..ed3e517 100644
--- a/ash/test/test_launcher_delegate.cc
+++ b/ash/test/test_launcher_delegate.cc
@@ -126,10 +126,6 @@ void TestLauncherDelegate::OnLauncherCreated(Launcher* launcher) {
 void TestLauncherDelegate::OnLauncherDestroyed(Launcher* launcher) {
 }
 
-bool TestLauncherDelegate::IsPerAppLauncher() {
-  return true;
-}
-
 LauncherID TestLauncherDelegate::GetLauncherIDForAppID(
     const std::string& app_id) {
   return 0;
diff --git a/ash/test/test_launcher_delegate.h b/ash/test/test_launcher_delegate.h
index 6214b8d..06d0cde 100644
--- a/ash/test/test_launcher_delegate.h
+++ b/ash/test/test_launcher_delegate.h
@@ -51,7 +51,6 @@ class TestLauncherDelegate : public LauncherDelegate,
   virtual bool ShouldShowTooltip(const LauncherItem& item) OVERRIDE;
   virtual void OnLauncherCreated(Launcher* launcher) OVERRIDE;
   virtual void OnLauncherDestroyed(Launcher* launcher) OVERRIDE;
-  virtual bool IsPerAppLauncher() OVERRIDE;
   virtual LauncherID GetLauncherIDForAppID(const std::string& app_id) OVERRIDE;
   virtual void PinAppWithID(const std::string& app_id) OVERRIDE;
   virtual bool IsAppPinned(const std::string& app_id) OVERRIDE;