| 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 592f71d0c489cedfbb9f1e812de82c963a3105dd..fb8cc1e5e32b6963722c4f74b625118cfe402c7a 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"
|
| @@ -72,6 +73,7 @@ class AppListServiceMac : public AppListServiceImpl,
|
| virtual void DismissAppList() OVERRIDE;
|
| virtual bool IsAppListVisible() const OVERRIDE;
|
| virtual gfx::NativeWindow GetAppListWindow() OVERRIDE;
|
| + virtual app_list::AppListModel* GetAppListModelForTesting() OVERRIDE;
|
|
|
| // AppListServiceImpl overrides:
|
| virtual void CreateShortcut() OVERRIDE;
|
| @@ -394,6 +396,11 @@ NSWindow* AppListServiceMac::GetAppListWindow() {
|
| return [window_controller_ window];
|
| }
|
|
|
| +app_list::AppListModel* AppListServiceMac::GetAppListModelForTesting() {
|
| + return
|
| + [[[window_controller_ appListViewController] appsGridController] model];
|
| +}
|
| +
|
| void AppListServiceMac::OnShimLaunch(apps::AppShimHandler::Host* host,
|
| apps::AppShimLaunchType launch_type) {
|
| if (IsAppListVisible())
|
|
|