Replace OnceOffCreateShortcuts with UpdateShortcutsForAllAppsIfNeeded.

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 "base/bind.h"
 #include "base/bind_helpers.h"
 #include "base/file_util.h"
 #include "base/i18n/file_util_icu.h"
 #include "base/prefs/pref_service.h"
 #include "base/strings/string_util.h"
 #include "base/strings/utf_string_conversions.h"
 #include "base/threading/thread.h"
+#include "chrome/browser/extensions/extension_ui_util.h"
 #include "chrome/browser/extensions/image_loader.h"
 #include "chrome/browser/extensions/tab_helper.h"
 #include "chrome/browser/favicon/favicon_tab_helper.h"
 #include "chrome/browser/profiles/profile.h"
 #include "chrome/common/chrome_constants.h"
 #include "chrome/common/chrome_version_info.h"
 #include "chrome/common/extensions/manifest_handlers/app_launch_info.h"
 #include "chrome/common/pref_names.h"
 #include "content/public/browser/browser_thread.h"
+#include "extensions/browser/extension_registry.h"
 #include "extensions/common/constants.h"
 #include "extensions/common/extension.h"
+#include "extensions/common/extension_set.h"
 #include "extensions/common/manifest_handlers/icons_handler.h"
 #include "grit/theme_resources.h"
 #include "skia/ext/image_operations.h"
 #include "third_party/skia/include/core/SkBitmap.h"
 #include "ui/base/resource/resource_bundle.h"
 #include "ui/gfx/image/image.h"
 #include "ui/gfx/image/image_family.h"
 #include "ui/gfx/image/image_skia.h"
 #include "url/url_constants.h"
 
@@ skipping 31 matching lines @@
   return left.width < right.width;
 }
 #endif
 
 base::FilePath GetShortcutDataDir(const web_app::ShortcutInfo& shortcut_info) {
   return web_app::GetWebAppDataDirectory(shortcut_info.profile_path,
                                          shortcut_info.extension_id,
                                          shortcut_info.url);
 }
 
+bool ShouldCreateShortcutFor(Profile* profile,
+                             const extensions::Extension* extension) {
+  return extension->is_platform_app() &&
+      extension->location() != extensions::Manifest::COMPONENT &&
+      extensions::ui_util::ShouldDisplayInAppLauncher(extension, profile);
+}
+
 void CreateShortcutsWithInfo(
     web_app::ShortcutCreationReason reason,
     const web_app::ShortcutLocations& locations,
     const web_app::ShortcutInfo& shortcut_info,
     const extensions::FileHandlersInfo& file_handlers_info) {
   DCHECK(BrowserThread::CurrentlyOn(BrowserThread::UI));
 
   BrowserThread::PostTask(
       BrowserThread::FILE,
       FROM_HERE,
@@ skipping 280 matching lines @@
           base::IgnoreResult(&web_app::internals::CreateShortcutsOnFileThread),
           reason, locations, shortcut_info));
 }
 
 void CreateShortcuts(ShortcutCreationReason reason,
                      const ShortcutLocations& locations,
                      Profile* profile,
                      const extensions::Extension* app) {
   DCHECK(BrowserThread::CurrentlyOn(BrowserThread::UI));
 
+  if (!ShouldCreateShortcutFor(profile, app))
+    return;
+
   GetInfoForApp(app,
                 profile,
                 base::Bind(&CreateShortcutsWithInfo, reason, locations));
 }
 
 void DeleteAllShortcuts(Profile* profile, const extensions::Extension* app) {
   DCHECK(BrowserThread::CurrentlyOn(BrowserThread::UI));
 
   ShortcutInfo shortcut_info =
       ShortcutInfoForExtensionAndProfile(app, profile);
   BrowserThread::PostTask(
       BrowserThread::FILE,
       FROM_HERE,
       base::Bind(&web_app::internals::DeletePlatformShortcuts,
                  GetShortcutDataDir(shortcut_info), shortcut_info));
 }
 
 void UpdateAllShortcuts(const base::string16& old_app_title,
                         Profile* profile,
                         const extensions::Extension* app) {
   DCHECK(BrowserThread::CurrentlyOn(BrowserThread::UI));
 
   GetInfoForApp(app,
                 profile,
                 base::Bind(&UpdateAllShortcutsForShortcutInfo, old_app_title));
 }
 
+void UpdateShortcutsForAllApps(Profile* profile) {
+  extensions::ExtensionRegistry* registry =
+      extensions::ExtensionRegistry::Get(profile);
+  if (!registry)
+    return;
+
+  // Get a set of app ids.
+  scoped_ptr<extensions::ExtensionSet> everything =
+      registry->GenerateInstalledExtensionsSet();
+  std::set<std::string> app_ids;
+  for (extensions::ExtensionSet::const_iterator it = everything->begin();
+       it != everything->end(); ++it) {
+    if (ShouldCreateShortcutFor(profile, it->get()))
+      app_ids.insert((*it)->id());

[tapted, 2014/05/30 06:33:27]

Why not just call

web_app::UpdateAllShortcuts(base::string16(), profile, extension);

here?

(I'm not sure if the explanation I came up with in my head is a good one, so I
want to hear yours :p)

[jackhou1, 2014/06/02 04:25:19]

Yeah, I agree with making this simpler until we actually need it. It also gives
the benefit of only jumping to the FILE thread on platforms where we actually
need to read from the filesystem first. On Mac, we can just update each one
individually and it should have the same effect.

+  }
+
+  BrowserThread::PostTask(
+      BrowserThread::FILE,
+      FROM_HERE,
+      base::Bind(
+          &web_app::internals::UpdateShortcutsForAllAppsForProfile,
+          profile->GetPath(), app_ids));
+}
+
 bool IsValidUrl(const GURL& url) {
   static const char* const kValidUrlSchemes[] = {
       url::kFileScheme,
       url::kFileSystemScheme,
       url::kFtpScheme,
       url::kHttpScheme,
       url::kHttpsScheme,
       extensions::kExtensionScheme,
   };
 
@@ skipping 24 matching lines @@
 
 #if defined(OS_LINUX)
 std::string GetWMClassFromAppName(std::string app_name) {
   file_util::ReplaceIllegalCharactersInPath(&app_name, '_');
   base::TrimString(app_name, "_", &app_name);
   return app_name;
 }
 #endif
 
 }  // namespace web_app