From b1b340a939cd35fd4d5be6c38e54c73f526bfe46 Mon Sep 17 00:00:00 2001 From: "jamescook@chromium.org" Date: Thu, 22 Aug 2013 08:05:50 +0000 Subject: Remove PerBrowser launcher, reland step 1 of 2 Relanding https://chromiumcodereview.appspot.com/22887015/ in two steps to preserve history of c/b/ui/ash/launcher/chrome_launcher_controller_per_app.* Step 2 will rename chrome_launcher_controller_per_app.* to chrome_launcher_controller.* Original description: 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. BUG=169303 TEST=unit_tests, browser_tests Launcher* TBR=skuhne@chromium.org Review URL: https://chromiumcodereview.appspot.com/23068021 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@218945 0039d316-1c4b-4281-b951-d872f2087c98 --- chrome/browser/ui/ash/app_list/app_list_controller_ash.cc | 2 +- chrome/browser/ui/ash/app_list/app_list_service_ash.cc | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) (limited to 'chrome/browser/ui/ash/app_list') diff --git a/chrome/browser/ui/ash/app_list/app_list_controller_ash.cc b/chrome/browser/ui/ash/app_list/app_list_controller_ash.cc index 7bf0587..4eea851 100644 --- a/chrome/browser/ui/ash/app_list/app_list_controller_ash.cc +++ b/chrome/browser/ui/ash/app_list/app_list_controller_ash.cc @@ -5,7 +5,7 @@ #include "chrome/browser/ui/ash/app_list/app_list_controller_ash.h" #include "ash/shell.h" -#include "chrome/browser/ui/ash/launcher/chrome_launcher_controller.h" +#include "chrome/browser/ui/ash/launcher/chrome_launcher_controller_per_app.h" AppListControllerDelegateAsh::AppListControllerDelegateAsh() {} diff --git a/chrome/browser/ui/ash/app_list/app_list_service_ash.cc b/chrome/browser/ui/ash/app_list/app_list_service_ash.cc index 1e9d69f..4aa59fa 100644 --- a/chrome/browser/ui/ash/app_list/app_list_service_ash.cc +++ b/chrome/browser/ui/ash/app_list/app_list_service_ash.cc @@ -9,7 +9,7 @@ #include "base/memory/singleton.h" #include "chrome/browser/profiles/profile.h" #include "chrome/browser/ui/app_list/app_list_service_impl.h" -#include "chrome/browser/ui/ash/launcher/chrome_launcher_controller.h" +#include "chrome/browser/ui/ash/launcher/chrome_launcher_controller_per_app.h" namespace { -- cgit v1.1