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,

[jackhou1, 2015/02/11 07:14:42]

Need to update the use of this function in web_app_mac.mm

[benwells, 2015/02/12 02:09:36]

Done.

+                             Profile* profile,
                              const extensions::Extension* extension) {
-  bool app_type_requires_shortcut = extension->is_platform_app();
+  // Only create shortcuts automatically if they are platform apps.
+  bool app_type_requires_shortcut = extension->is_platform_app() ||
+      reason == SHORTCUT_CREATION_BY_USER;
 
 // An additional check here for OS X. We need app shims to be
 // able to show them in the dock.
 #if defined(OS_MACOSX)
-  if (base::CommandLine::ForCurrentProcess()->HasSwitch(
+  if (!base::CommandLine::ForCurrentProcess()->HasSwitch(

[jackhou1, 2015/02/11 07:14:42]

With the inverted logic, if there's an automatic shortcut creation, and that
switch is on, this will no longer create shortcuts for hosted apps.

I think the logic should stay the same for Mac. I.e. on Mac we ignore |reason|
as before. So maybe something like:

  // Only create the shortcut automatically if they are platform apps.
  bool app_type_requires_shortcut = extension->is_platform_app();

// An additional check here for OS X. We need app shims to be
// able to show them in the dock.
#if defined(OS_MACOSX)
  if (base::CommandLine::ForCurrentProcess()->HasSwitch(
          switches::kEnableHostedAppShimCreation)) {
    app_type_requires_shortcut |= extension->is_hosted_app();
  }
#else
  // Always create the shortcut if it was requested by the user.
  app_type_requires_shortcut |= reason == SHORTCUT_CREATION_BY_USER;
#endif

[benwells, 2015/02/12 02:09:36]

Good point. I've update the logic to always create hosted apps on mac with the
flag enabled. I've also simplified the logic a bit to make it easier to
understand; hopefully its still equivalent.

           switches::kEnableHostedAppShimCreation)) {
     app_type_requires_shortcut =
-        app_type_requires_shortcut || extension->is_hosted_app();
+        app_type_requires_shortcut && !extension->is_hosted_app();
   }
 #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,
@@ skipping 93 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