| 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 3a45759192ba84773b076c36e05fb26061f19826..4825a4a1a679f899dd127e8725f3ff4018ebf6fb 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,
|
| + bool launch_now) OVERRIDE;
|
| virtual void OnShimClose(apps::AppShimHandler::Host* host) OVERRIDE;
|
| virtual void OnShimFocus(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,
|
| + bool launch_now) {
|
| ShowForSavedProfile();
|
| observers_.AddObserver(host);
|
| return true;
|
|
|