| Index: chrome/browser/ui/app_list/app_list_service_mac.mm
|
| diff --git a/chrome/browser/ui/app_list/app_list_service_mac.mm b/chrome/browser/ui/app_list/app_list_service_mac.mm
|
| index 0fc1053b35050640d42c481d59f1a1d8e064ac2d..6d2ccd57192d622892e5e52234b0ca7201172451 100644
|
| --- a/chrome/browser/ui/app_list/app_list_service_mac.mm
|
| +++ b/chrome/browser/ui/app_list/app_list_service_mac.mm
|
| @@ -37,6 +37,7 @@
|
| #include "grit/google_chrome_strings.h"
|
| #import "ui/app_list/cocoa/app_list_view_controller.h"
|
| #import "ui/app_list/cocoa/app_list_window_controller.h"
|
| +#import "ui/app_list/cocoa/apps_grid_controller.h"
|
| #include "ui/base/l10n/l10n_util.h"
|
| #include "ui/base/resource/resource_bundle.h"
|
| #include "ui/gfx/display.h"
|
| @@ -73,6 +74,7 @@ class AppListServiceMac : public AppListServiceImpl,
|
| virtual bool IsAppListVisible() const OVERRIDE;
|
| virtual gfx::NativeWindow GetAppListWindow() OVERRIDE;
|
| virtual AppListControllerDelegate* CreateControllerDelegate() OVERRIDE;
|
| + virtual app_list::AppListModel* GetAppListModelForTesting() OVERRIDE;
|
|
|
| // AppListServiceImpl overrides:
|
| virtual void CreateShortcut() OVERRIDE;
|
| @@ -399,6 +401,12 @@ AppListControllerDelegate* AppListServiceMac::CreateControllerDelegate() {
|
| return new AppListControllerDelegateCocoa();
|
| }
|
|
|
| +app_list::AppListModel* AppListServiceMac::GetAppListModelForTesting() {
|
| + AppListViewController* view_controller =
|
| + [window_controller_ appListViewController];
|
| + return [[view_controller appsGridController] model];
|
| +}
|
| +
|
| void AppListServiceMac::OnShimLaunch(apps::AppShimHandler::Host* host,
|
| apps::AppShimLaunchType launch_type) {
|
| if (IsAppListVisible())
|
|
|