diff options
| author | tapted@chromium.org <tapted@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-08-27 04:18:24 +0000 |
|---|---|---|
| committer | tapted@chromium.org <tapted@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-08-27 04:18:24 +0000 |
| commit | d294811b8c0de6a51996597bdbd65a20d900283f (patch) | |
| tree | 68f9345944846bdbfad45d490ad72fc2b7ab65db /chrome/browser/ui/ash/app_list | |
| parent | f28d64d626f537ff37da73c5178aa63f5685bd99 (diff) | |
| download | chromium_src-d294811b8c0de6a51996597bdbd65a20d900283f.zip chromium_src-d294811b8c0de6a51996597bdbd65a20d900283f.tar.gz chromium_src-d294811b8c0de6a51996597bdbd65a20d900283f.tar.bz2 | |
Expose tests in AppListControllerBrowsertest to more platforms.
- Enables CreateNewWindow for Mac and CrOS
- Enables ShowAndDismiss, SwitchAppListProfiles and
. . ShowAppListFlag for Win-Aura
BUG=169114
Review URL: https://chromiumcodereview.appspot.com/23020031
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@219692 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_service_ash.cc | 6 |
1 files changed, 6 insertions, 0 deletions
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..232e1b1 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,6 +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/app_list/app_list_controller_ash.h" #include "chrome/browser/ui/ash/launcher/chrome_launcher_controller.h" namespace { @@ -34,6 +35,7 @@ class AppListServiceAsh : public AppListServiceImpl { virtual void DismissAppList() OVERRIDE; virtual void EnableAppList(Profile* initial_profile) OVERRIDE; virtual gfx::NativeWindow GetAppListWindow() OVERRIDE; + virtual AppListControllerDelegate* CreateControllerDelegate() OVERRIDE; DISALLOW_COPY_AND_ASSIGN(AppListServiceAsh); }; @@ -70,6 +72,10 @@ gfx::NativeWindow AppListServiceAsh::GetAppListWindow() { return NULL; } +AppListControllerDelegate* AppListServiceAsh::CreateControllerDelegate() { + return new AppListControllerDelegateAsh(); +} + } // namespace namespace chrome { |