| Index: chrome/browser/web_applications/web_app.cc
|
| diff --git a/chrome/browser/web_applications/web_app.cc b/chrome/browser/web_applications/web_app.cc
|
| index ec13b3742313d5c40a59dfe42a7de9b8504ada5c..2df8aed17e1aaba6b9d2ee5e30b5b4a449da4e2c 100644
|
| --- a/chrome/browser/web_applications/web_app.cc
|
| +++ b/chrome/browser/web_applications/web_app.cc
|
| @@ -6,6 +6,7 @@
|
|
|
| #include "base/bind.h"
|
| #include "base/bind_helpers.h"
|
| +#include "base/command_line.h"
|
| #include "base/files/file_util.h"
|
| #include "base/i18n/file_util_icu.h"
|
| #include "base/prefs/pref_service.h"
|
| @@ -17,6 +18,7 @@
|
| #include "chrome/browser/profiles/profile.h"
|
| #include "chrome/browser/profiles/profile_manager.h"
|
| #include "chrome/common/chrome_constants.h"
|
| +#include "chrome/common/chrome_switches.h"
|
| #include "chrome/common/chrome_version_info.h"
|
| #include "chrome/common/extensions/manifest_handlers/app_launch_info.h"
|
| #include "chrome/common/pref_names.h"
|
| @@ -275,8 +277,11 @@ bool ShouldCreateShortcutFor(Profile* profile,
|
| // An additional check here for OS X. We need app shims to be
|
| // able to show them in the dock.
|
| #if defined(OS_MACOSX)
|
| - app_type_requires_shortcut =
|
| - app_type_requires_shortcut || extension->is_hosted_app();
|
| + if (base::CommandLine::ForCurrentProcess()->HasSwitch(
|
| + switches::kEnableHostedAppShimCreation)) {
|
| + app_type_requires_shortcut =
|
| + app_type_requires_shortcut || extension->is_hosted_app();
|
| + }
|
| #endif
|
|
|
| return (app_type_requires_shortcut &&
|
|
|