| Index: chrome/browser/extensions/extension_service.cc
|
| diff --git a/chrome/browser/extensions/extension_service.cc b/chrome/browser/extensions/extension_service.cc
|
| index 84397982cc4e10874b4d7d1a24dfd29d71d0adef..c266a85b820a9df21dee06f12ca029291ff7f590 100644
|
| --- a/chrome/browser/extensions/extension_service.cc
|
| +++ b/chrome/browser/extensions/extension_service.cc
|
| @@ -2635,7 +2635,16 @@ ExtensionService::NaClModuleInfoList::iterator
|
|
|
| void ExtensionService::StartInstallApplicationShortcut(
|
| const Extension* extension) {
|
| -#if !defined(OS_MACOSX)
|
| +#if defined(OS_MACOSX)
|
| + // TODO(sail): For now only install shortcuts if enable platform apps is true
|
| + // and if the extension is a platform app.
|
| + if (!extension->is_platform_app() ||
|
| + !CommandLine::ForCurrentProcess()->HasSwitch(
|
| + switches::kEnablePlatformApps)) {
|
| + return;
|
| + }
|
| +#endif
|
| +
|
| const int kAppIconSize = 32;
|
|
|
| shortcut_info_.extension_id = extension->id();
|
| @@ -2671,7 +2680,6 @@ void ExtensionService::StartInstallApplicationShortcut(
|
| icon_resource,
|
| max_size,
|
| ImageLoadingTracker::DONT_CACHE);
|
| -#endif
|
| }
|
|
|
| void ExtensionService::OnImageLoaded(SkBitmap *image,
|
|
|