Add bookmark apps to taskbar automatically.

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/command_line.h"
 #include "base/files/file_util.h"
@@ skipping 265 matching lines @@
       base::Bind(&OnImageLoaded, shortcut_info, file_handlers_info, callback));
 }
 
 void GetShortcutInfoForApp(const extensions::Extension* extension,
                            Profile* profile,
                            const ShortcutInfoCallback& callback) {
   GetInfoForApp(
       extension, profile, base::Bind(&IgnoreFileHandlersInfo, callback));
 }
 
-bool ShouldCreateShortcutFor(Profile* profile,
+bool ShouldCreateShortcutFor(web_app::ShortcutCreationReason reason,
+                             Profile* profile,
                              const extensions::Extension* extension) {
-  bool app_type_requires_shortcut = extension->is_platform_app();
+  // 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;
+  }
 
-// An additional check here for OS X. We need app shims to be
-// able to show them in the dock.
+  // Otherwise, 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)) {
-    app_type_requires_shortcut =
-        app_type_requires_shortcut || extension->is_hosted_app();
+    return extension->is_hosted_app();
   }
+
+  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
-
-  return (app_type_requires_shortcut &&
-          extension->location() != extensions::Manifest::COMPONENT &&
-          extensions::ui_util::CanDisplayInAppLauncher(extension, profile));
 }
 
 base::FilePath GetWebAppDataDirectory(const base::FilePath& profile_path,
                                       const std::string& extension_id,
                                       const GURL& url) {
   DCHECK(!profile_path.empty());
   base::FilePath app_data_dir(profile_path.Append(chrome::kWebAppDirname));
 
   if (!extension_id.empty()) {
     return app_data_dir.AppendASCII(
@@ skipping 87 matching lines @@
   ScheduleCreatePlatformShortcut(SHORTCUT_CREATION_AUTOMATED, locations,
                                  shortcut_info, extensions::FileHandlersInfo());
 }
 
 void CreateShortcuts(ShortcutCreationReason reason,
                      const ShortcutLocations& locations,
                      Profile* profile,
                      const extensions::Extension* app) {
   DCHECK(BrowserThread::CurrentlyOn(BrowserThread::UI));
 
-  if (!ShouldCreateShortcutFor(profile, app))
+  if (!ShouldCreateShortcutFor(reason, 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 =
@@ skipping 52 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