Create hosted app shims on Mac.

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/files/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/browser_process.h"
 #include "chrome/browser/extensions/extension_ui_util.h"
 #include "chrome/browser/profiles/profile.h"
+#include "chrome/browser/profiles/profile_manager.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/browser/image_loader.h"
 #include "extensions/common/constants.h"
 #include "extensions/common/extension.h"
 #include "extensions/common/extension_set.h"
@@ skipping 234 matching lines @@
 
 void GetShortcutInfoForApp(const extensions::Extension* extension,
                            Profile* profile,
                            const ShortcutInfoCallback& callback) {
   GetInfoForApp(
       extension, profile, base::Bind(&IgnoreFileHandlersInfo, callback));
 }
 
 bool ShouldCreateShortcutFor(Profile* profile,
                              const extensions::Extension* extension) {
-  return extension->is_platform_app() &&
-         extension->location() != extensions::Manifest::COMPONENT &&
-         extensions::ui_util::CanDisplayInAppLauncher(extension, profile);
+  bool platform_app = extension->is_platform_app();
+#if defined(OS_MACOSX)
+  platform_app = platform_app || extension->is_hosted_app();

[calamity, 2014/12/05 02:22:21]

Drive-by nit: If this is the mac-needs-shims-always-because-the-dock-requires-it
thing then there should be a comment here.

Also, I think a better variable name is app_type_requires_shortcut.

[mitchellj, 2014/12/05 05:07:48]

Done.

+#endif
+
+  return (platform_app &&
+          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 52 matching lines @@
   return app_name.substr(prefix.length());
 }
 
 void CreateShortcutsWithInfo(
     ShortcutCreationReason reason,
     const ShortcutLocations& locations,
     const ShortcutInfo& shortcut_info,
     const extensions::FileHandlersInfo& file_handlers_info) {
   DCHECK(BrowserThread::CurrentlyOn(BrowserThread::UI));
 
+  // It's possible for the extension to be deleted before we get here.
+  // For example, creating a hosted app from a website. Double check that
+  // it still exists.
+  Profile* profile = g_browser_process->profile_manager()->GetProfileByPath(
+      shortcut_info.profile_path);
+  if (!profile)
+    return;
+
+  extensions::ExtensionRegistry* registry =
+      extensions::ExtensionRegistry::Get(profile);
+  const extensions::Extension* extension = registry->GetExtensionById(
+      shortcut_info.extension_id, extensions::ExtensionRegistry::ENABLED);
+  if (!extension)
+    return;
+
   BrowserThread::PostTask(
       BrowserThread::FILE,
       FROM_HERE,
       base::Bind(base::IgnoreResult(&internals::CreatePlatformShortcuts),
                  GetShortcutDataDir(shortcut_info),
                  shortcut_info,
                  file_handlers_info,
                  locations,
                  reason));
 }
@@ skipping 70 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