| 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 254527b9956e597f45b1d0a5832e05cad4eb0c15..ab341834f278de93cdd108d1d9c76dc458eb1289 100644
|
| --- a/chrome/browser/ui/app_list/app_list_service_mac.mm
|
| +++ b/chrome/browser/ui/app_list/app_list_service_mac.mm
|
| @@ -61,7 +61,8 @@ class AppListServiceMac : public AppListServiceImpl,
|
| virtual void EnableAppList() OVERRIDE;
|
|
|
| // AppShimHandler overrides:
|
| - virtual bool OnShimLaunch(apps::AppShimHandler::Host* host) OVERRIDE;
|
| + virtual bool OnShimLaunch(apps::AppShimHandler::Host* host,
|
| + apps::AppShimLaunchType launch_type) OVERRIDE;
|
| virtual void OnShimClose(apps::AppShimHandler::Host* host) OVERRIDE;
|
| virtual void OnShimFocus(apps::AppShimHandler::Host* host) OVERRIDE;
|
| virtual void OnShimQuit(apps::AppShimHandler::Host* host) OVERRIDE;
|
| @@ -271,7 +272,8 @@ NSWindow* AppListServiceMac::GetNativeWindow() {
|
| return [window_controller_ window];
|
| }
|
|
|
| -bool AppListServiceMac::OnShimLaunch(apps::AppShimHandler::Host* host) {
|
| +bool AppListServiceMac::OnShimLaunch(apps::AppShimHandler::Host* host,
|
| + apps::AppShimLaunchType launch_type) {
|
| ShowForSavedProfile();
|
| observers_.AddObserver(host);
|
| return true;
|
|
|