diff options
| author | jamescook@chromium.org <jamescook@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-08-22 19:09:53 +0000 |
|---|---|---|
| committer | jamescook@chromium.org <jamescook@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-08-22 19:09:53 +0000 |
| commit | 8218e4f8aceef38f71cc029ae0b0a5db09c32cee (patch) | |
| tree | d88d35c87139ea6dad625ed00da6cf95e1fe0d8e /chrome/browser/ui/ash/app_list | |
| parent | 1735822eae8804e8c0a6cc1fff03878eeedfaf5a (diff) | |
| download | chromium_src-8218e4f8aceef38f71cc029ae0b0a5db09c32cee.zip chromium_src-8218e4f8aceef38f71cc029ae0b0a5db09c32cee.tar.gz chromium_src-8218e4f8aceef38f71cc029ae0b0a5db09c32cee.tar.bz2 | |
Remove PerBrowser launcher, reland step 2 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.*
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/23060023
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@219063 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/browser/ui/ash/app_list')
| -rw-r--r-- | chrome/browser/ui/ash/app_list/app_list_controller_ash.cc | 2 | ||||
| -rw-r--r-- | chrome/browser/ui/ash/app_list/app_list_service_ash.cc | 2 |
2 files changed, 2 insertions, 2 deletions
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 4eea851..7bf0587 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_per_app.h" +#include "chrome/browser/ui/ash/launcher/chrome_launcher_controller.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 4aa59fa..1e9d69f 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_per_app.h" +#include "chrome/browser/ui/ash/launcher/chrome_launcher_controller.h" namespace { |