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

chrome/browser/web_applications/web_app_mac.mm

 // 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.
 
 #import "chrome/browser/web_applications/web_app_mac.h"
 
 #import <Carbon/Carbon.h>
 #import <Cocoa/Cocoa.h>
 #include <stdint.h>
 
@@ skipping 12 matching lines @@
 #include "base/path_service.h"
 #include "base/process/process_handle.h"
 #include "base/strings/string16.h"
 #include "base/strings/string_number_conversions.h"
 #include "base/strings/string_split.h"
 #include "base/strings/string_util.h"
 #include "base/strings/sys_string_conversions.h"
 #include "base/strings/utf_string_conversions.h"
 #include "base/version.h"
 #include "chrome/browser/browser_process.h"
+#include "chrome/browser/extensions/extension_ui_util.h"
 #import "chrome/browser/mac/dock.h"
 #include "chrome/browser/profiles/profile.h"
 #include "chrome/browser/profiles/profile_manager.h"
 #include "chrome/browser/shell_integration.h"
 #include "chrome/browser/ui/app_list/app_list_service.h"
 #include "chrome/browser/ui/cocoa/key_equivalent_constants.h"
 #include "chrome/common/channel_info.h"
 #include "chrome/common/chrome_constants.h"
 #include "chrome/common/chrome_paths.h"
 #include "chrome/common/chrome_switches.h"
@@ skipping 565 matching lines @@
 }
 
 void RevealAppShimInFinderForAppOnFileThread(
     scoped_ptr<web_app::ShortcutInfo> shortcut_info,
     const base::FilePath& app_path) {
   web_app::WebAppShortcutCreator shortcut_creator(
       app_path, shortcut_info.get(), extensions::FileHandlersInfo());
   shortcut_creator.RevealAppShimInFinder();
 }
 
+// Mac-specific version of web_app::ShouldCreateShortcutFor() used during batch
+// upgrades to ensure all shortcuts a user may still have are repaired when
+// required by a Chrome upgrade.
+bool ShouldUpgradeShortcutFor(Profile* profile,
+                              const extensions::Extension* extension) {
+  if (extension->location() == extensions::Manifest::COMPONENT ||
+      !extensions::ui_util::CanDisplayInAppLauncher(extension, profile)) {
+    return false;
+  }
+
+  return extension->is_app();
+}
+
 }  // namespace
 
 @interface CrCreateAppShortcutCheckboxObserver : NSObject {
  @private
   NSButton* checkbox_;
   NSButton* continueButton_;
 }
 
 - (id)initWithCheckbox:(NSButton*)checkbox
         continueButton:(NSButton*)continueButton;
@@ skipping 202 matching lines @@
     base::DeleteFile(bundle_path, true);
 
   // Delete the internal one.
   DeletePathAndParentIfEmpty(GetInternalShortcutPath());
 }
 
 bool WebAppShortcutCreator::UpdateShortcuts() {
   std::vector<base::FilePath> paths;
   paths.push_back(app_data_dir_);
 
+  // Remember whether the copy in the profile directory exists. If it doesn't
+  // and others do, it should be re-created. Otherwise, it's a signal that a
+  // shortcut has never been created.
+  bool profile_copy_exists = base::PathExists(GetInternalShortcutPath());
+
   // Try to update the copy under ~/Applications. If that does not exist, check
   // if a matching bundle can be found elsewhere.
   base::FilePath app_path = GetApplicationsShortcutPath();
 
   // Never look in ~/Applications or search the system for a bundle ID in a test
   // since that relies on global system state and potentially cruft that may be
   // leftover from prior/crashed test runs.
   // TODO(tapted): Remove this check when tests that arrive here via setting
   // |g_app_shims_allow_update_and_launch_in_tests| can properly mock out all
   // the calls below.
   if (!g_app_shims_allow_update_and_launch_in_tests) {
     if (app_path.empty() || !base::PathExists(app_path))
       app_path = GetAppBundleById(GetBundleIdentifier());
 
     if (app_path.empty()) {
-      if (info_->from_bookmark) {
+      if (profile_copy_exists && info_->from_bookmark) {
         // The bookmark app shortcut has been deleted by the user. Restore it,
         // as the Mac UI for bookmark apps creates the expectation that the app
         // will be added to Applications.
         app_path = GetApplicationsDirname();
         paths.push_back(app_path);
       }
     } else {
       paths.push_back(app_path.DirName());
     }
+  } else {
+    // If a test has set g_app_shims_allow_update_and_launch_in_tests, it means
+    // it relies on UpdateShortcuts() to create shortcuts. (Tests can't rely on
+    // install-triggered shortcut creation because they can't synchronize with
+    // the UI thread). So, allow shortcuts to be created for this case, even if
+    // none currently exist. TODO(tapted): Remove this when tests are properly
+    // mocked.
+    profile_copy_exists = true;
   }
 
+  // When upgrading, if no shim exists anywhere on disk, don't create the copy
+  // under the profile directory for the first time. The best way to tell
+  // whether a shortcut has been created is to poke around on disk, so the
+  // upgrade process must send all candidate extensions to the FILE thread.
+  // Then those without shortcuts will get culled here.
+  if (paths.size() == 1 && !profile_copy_exists)
+    return false;
+
   size_t success_count = CreateShortcutsIn(paths);
   if (success_count == 0)
     return false;
 
   UpdateInternalBundleIdentifier();
   return success_count == paths.size() && !app_path.empty();
 }
 
 base::FilePath WebAppShortcutCreator::GetApplicationsDirname() const {
   base::FilePath path = GetWritableApplicationsDirectory();
@@ skipping 300 matching lines @@
   if (!registry)
     return;
 
   scoped_refptr<Latch> latch = new Latch(callback);
 
   // Update all apps.
   scoped_ptr<extensions::ExtensionSet> candidates =
       registry->GenerateInstalledExtensionsSet();
   for (auto& extension_refptr : *candidates) {
     const extensions::Extension* extension = extension_refptr.get();
-    if (web_app::ShouldCreateShortcutFor(SHORTCUT_CREATION_AUTOMATED, profile,
-                                         extension)) {
+    if (ShouldUpgradeShortcutFor(profile, extension)) {
       web_app::UpdateAllShortcuts(base::string16(), profile, extension,
                                   latch->NoOpClosure());
     }
   }
 }
 
 void RevealAppShimInFinderForApp(Profile* profile,
                                  const extensions::Extension* app) {
   scoped_ptr<web_app::ShortcutInfo> shortcut_info =
       ShortcutInfoForExtensionAndProfile(app, profile);
@@ skipping 66 matching lines @@
   web_app::GetShortcutInfoForApp(
       app,
       profile,
       base::Bind(&web_app::CreateAppShortcutInfoLoaded,
                  profile,
                  app,
                  close_callback));
 }
 
 }  // namespace chrome