Mac: Don't create shortcuts for hosted apps when they are installed

chrome/browser/web_applications/web_app.cc

 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "chrome/browser/web_applications/web_app.h"
 
 #include <stddef.h>
 #include <utility>
 
 #include "base/bind.h"
@@ skipping 292 matching lines @@
 bool ShouldCreateShortcutFor(web_app::ShortcutCreationReason reason,
                              Profile* profile,
                              const extensions::Extension* extension) {
   // Shortcuts should never be created for component apps, or for apps that
   // cannot be shown in the launcher.
   if (extension->location() == extensions::Manifest::COMPONENT ||
       !extensions::ui_util::CanDisplayInAppLauncher(extension, profile)) {
     return false;
   }
 
-  // Otherwise, always create shortcuts for v2 packaged apps.
+  // Always create shortcuts for v2 packaged apps.
   if (extension->is_platform_app())
     return true;
 
 #if defined(OS_MACOSX)
-  if (!base::CommandLine::ForCurrentProcess()->HasSwitch(
-          switches::kDisableHostedAppShimCreation)) {
-    return extension->is_hosted_app();
+  // A bookmark app installs itself as an extension, then automatically triggers
+  // a shortcut request with SHORTCUT_CREATION_AUTOMATED. Allow this flow, but
+  // do not automatically create shortcuts for default-installed extensions,
+  // until it is explicitly requested by the user.
+  if (extension->was_installed_by_default() &&
+      reason == SHORTCUT_CREATION_AUTOMATED)
+    return false;
+
+  if (extension->from_bookmark())
+    return true;
+
+  // Otherwise, don't create shortcuts for automated codepaths.
+  if (reason == SHORTCUT_CREATION_AUTOMATED)
+    return false;
+
+  if (extension->is_hosted_app()) {
+    return !base::CommandLine::ForCurrentProcess()->HasSwitch(
+        switches::kDisableHostedAppShimCreation);
   }
 
+  // Only reached for "legacy" packaged apps. Default to false on Mac.
   return false;
 #else
   // For other platforms, allow shortcut creation if it was explicitly
   // requested by the user (i.e. is not automatic).
   return reason == SHORTCUT_CREATION_BY_USER;
 #endif
 }
 
 base::FilePath GetWebAppDataDirectory(const base::FilePath& profile_path,
                                       const std::string& extension_id,
@@ skipping 167 matching lines @@
 
 #if defined(OS_LINUX)
 std::string GetWMClassFromAppName(std::string app_name) {
   base::i18n::ReplaceIllegalCharactersInPath(&app_name, '_');
   base::TrimString(app_name, "_", &app_name);
   return app_name;
 }
 #endif
 
 }  // namespace web_app