Do not create app shims for sync'd PWAs on Mac

This CL ensures we do not spam the user's Application directory on Mac
when syncing down installed PWAs. This makes Mac behave the same as
Windows and Linux.

Bug: 929559
Change-Id: I31df57e7d8228b2a47cc362f258afeee2dc840ef
Reviewed-on: https://chromium-review.googlesource.com/c/1457698
Commit-Queue: Alan Cutter <alancutter@chromium.org>
Reviewed-by: Dominick Ng <dominickn@chromium.org>
Reviewed-by: Ben Wells <benwells@chromium.org>
Cr-Commit-Position: refs/heads/master@{#629935}

chrome/browser/extensions/bookmark_app_helper.cc

@@ -501,14 +501,6 @@ void BookmarkAppHelper::FinishInstallation(const Extension* extension) {
   const bool silent_install =
       (chrome::FindBrowserWithWebContents(contents_) == nullptr);
 
-// On Mac, shortcuts are automatically created for hosted apps when they are
-// installed, so there is no need to create them again.
-#if defined(OS_MACOSX)
-  if (!silent_install && !base::CommandLine::ForCurrentProcess()->HasSwitch(
-                             ::switches::kDisableHostedAppShimCreation)) {
-    web_app::RevealAppShimInFinderForApp(current_profile, extension);
-  }
-#else
   if (create_shortcuts_) {
 #if !defined(OS_CHROMEOS)
     web_app::ShortcutLocations creation_locations;
@@ -532,13 +524,22 @@ void BookmarkAppHelper::FinishInstallation(const Extension* extension) {
 #endif  // !defined(OS_CHROMEOS)
   }
 
-  // Reparent the tab into an app window immediately when opening as a window.
-  if (!silent_install &&
-      base::FeatureList::IsEnabled(::features::kDesktopPWAWindowing) &&
-      launch_type == LAUNCH_TYPE_WINDOW && !profile_->IsOffTheRecord()) {
-    ReparentWebContentsIntoAppBrowser(contents_, extension);
-  }
+  if (!silent_install) {
+#if defined(OS_MACOSX)
+    // TODO(https://crbug.com/915571): Reparent the tab on Mac just like the
+    // other platforms.
+    if (!base::CommandLine::ForCurrentProcess()->HasSwitch(
+            ::switches::kDisableHostedAppShimCreation)) {
+      web_app::RevealAppShimInFinderForApp(current_profile, extension);
+    }
+#else
+    // Reparent the tab into an app window immediately when opening as a window.
+    if (base::FeatureList::IsEnabled(::features::kDesktopPWAWindowing) &&
+        launch_type == LAUNCH_TYPE_WINDOW && !profile_->IsOffTheRecord()) {
+      ReparentWebContentsIntoAppBrowser(contents_, extension);
+    }
 #endif  // !defined(OS_MACOSX)
+  }
 
   callback_.Run(extension, web_app_info_);
 }

chrome/browser/web_applications/extensions/web_app_extension_shortcut.cc

@@ -228,33 +228,16 @@ bool ShouldCreateShortcutFor(ShortcutCreationReason reason,
     return true;
 
 #if defined(OS_MACOSX)
-  // 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)
+  if (extension->is_hosted_app() &&
+      base::CommandLine::ForCurrentProcess()->HasSwitch(
+          switches::kDisableHostedAppShimCreation)) {
     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);
   }
+#endif
 
-  // 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).
+  // 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,