[Mac] Rebuild app shims when they fail to dyload Chrome Framework.

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"
@@ skipping 24 matching lines @@
 #include "ui/gfx/image/image_skia.h"
 
 #if defined(OS_WIN)
 #include "ui/gfx/icon_util.h"
 #endif
 
 using content::BrowserThread;
 
 namespace {
 
-typedef base::Callback<void(const web_app::ShortcutInfo&,
-                            const extensions::FileHandlersInfo&)> InfoCallback;
-
 #if defined(OS_MACOSX)
 const int kDesiredSizes[] = {16, 32, 128, 256, 512};
 const size_t kNumDesiredSizes = arraysize(kDesiredSizes);
 #elif defined(OS_LINUX)
 // Linux supports icons of any size. FreeDesktop Icon Theme Specification states
 // that "Minimally you should install a 48x48 icon in the hicolor theme."
 const int kDesiredSizes[] = {16, 32, 48, 128, 256, 512};
 const size_t kNumDesiredSizes = arraysize(kDesiredSizes);
 #elif defined(OS_WIN)
 const int* kDesiredSizes = IconUtil::kIconDimensions;
@@ skipping 69 matching lines @@
     const extensions::FileHandlersInfo& file_handlers_info) {
   BrowserThread::PostTask(
       BrowserThread::FILE,
       FROM_HERE,
       base::Bind(&UpdateShortcutsOnFileThread,
                  old_app_title, shortcut_info, file_handlers_info));
 }
 
 void OnImageLoaded(web_app::ShortcutInfo shortcut_info,
                    extensions::FileHandlersInfo file_handlers_info,
-                   InfoCallback callback,
+                   web_app::InfoCallback callback,
                    const gfx::ImageFamily& image_family) {
   // If the image failed to load (e.g. if the resource being loaded was empty)
   // use the standard application icon.
   if (image_family.empty()) {
     gfx::Image default_icon =
         ResourceBundle::GetSharedInstance().GetImageNamed(IDR_APP_DEFAULT_ICON);
     int size = kDesiredSizes[kNumDesiredSizes - 1];
     SkBitmap bmp = skia::ImageOperations::Resize(
           *default_icon.ToSkBitmap(), skia::ImageOperations::RESIZE_BEST,
           size, size);
     gfx::ImageSkia image_skia = gfx::ImageSkia::CreateFrom1xBitmap(bmp);
     // We are on the UI thread, and this image is needed from the FILE thread,
     // for creating shortcut icon files.
     image_skia.MakeThreadSafe();
     shortcut_info.favicon.Add(gfx::Image(image_skia));
   } else {
     shortcut_info.favicon = image_family;
   }
 
   callback.Run(shortcut_info, file_handlers_info);
 }
 
+void IgnoreFileHandlersInfo(
+    const web_app::ShortcutInfoCallback& shortcut_info_callback,
+    const web_app::ShortcutInfo& shortcut_info,
+    const extensions::FileHandlersInfo& file_handlers_info) {
+  shortcut_info_callback.Run(shortcut_info);
+}
+
+}  // namespace
+
+namespace web_app {
+
+// The following string is used to build the directory name for
+// shortcuts to chrome applications (the kind which are installed
+// from a CRX).  Application shortcuts to URLs use the {host}_{path}
+// for the name of this directory.  Hosts can't include an underscore.
+// By starting this string with an underscore, we ensure that there
+// are no naming conflicts.
+static const char* kCrxAppPrefix = "_crx_";

[tapted, 2014/05/06 07:13:24]

nit: (since it's showing up in the diff) should this be `const char
kCrxAppPrefix[]` (instead of char*) like all the other strings?

[jackhou1, 2014/05/06 08:38:17]

Done.

+
+namespace internals {
+
 void GetInfoForApp(const extensions::Extension* extension,
                    Profile* profile,
                    const InfoCallback& callback) {
   web_app::ShortcutInfo shortcut_info =
       web_app::ShortcutInfoForExtensionAndProfile(extension, profile);
   extensions::FileHandlersInfo file_handlers_info;
   const std::vector<extensions::FileHandlerInfo>* file_handlers =
       extensions::FileHandlers::GetFileHandlers(extension);
   if (file_handlers)
     file_handlers_info.handlers = *file_handlers;
@@ skipping 36 matching lines @@
 
   // |info_list| may still be empty at this point, in which case
   // LoadImageFamilyAsync will call the OnImageLoaded callback with an empty
   // image and exit immediately.
   extensions::ImageLoader::Get(profile)->LoadImageFamilyAsync(
       extension,
       info_list,
       base::Bind(&OnImageLoaded, shortcut_info, file_handlers_info, callback));
 }
 
-void IgnoreFileHandlersInfo(
-    const web_app::ShortcutInfoCallback& shortcut_info_callback,
-    const web_app::ShortcutInfo& shortcut_info,
-    const extensions::FileHandlersInfo& file_handlers_info) {
-  shortcut_info_callback.Run(shortcut_info);
-}
-
-}  // namespace
-
-namespace web_app {
-
-// The following string is used to build the directory name for
-// shortcuts to chrome applications (the kind which are installed
-// from a CRX).  Application shortcuts to URLs use the {host}_{path}
-// for the name of this directory.  Hosts can't include an underscore.
-// By starting this string with an underscore, we ensure that there
-// are no naming conflicts.
-static const char* kCrxAppPrefix = "_crx_";
-
-namespace internals {
-
 base::FilePath GetSanitizedFileName(const base::string16& name) {
 #if defined(OS_WIN)
   base::string16 file_name = name;
 #else
   std::string file_name = base::UTF16ToUTF8(name);
 #endif
   file_util::ReplaceIllegalCharactersInPath(&file_name, '_');
   return base::FilePath(file_name);
 }
 
@@ skipping 65 matching lines @@
   shortcut_info.profile_path = profile->GetPath();
   shortcut_info.profile_name =
       profile->GetPrefs()->GetString(prefs::kProfileName);
   return shortcut_info;
 }
 
 void UpdateShortcutInfoAndIconForApp(
     const extensions::Extension* extension,
     Profile* profile,
     const web_app::ShortcutInfoCallback& callback) {
-  GetInfoForApp(extension,
-                profile,
-                base::Bind(&IgnoreFileHandlersInfo, callback));
+  internals::GetInfoForApp(extension,
+                           profile,
+                           base::Bind(&IgnoreFileHandlersInfo, callback));
 }
 
 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 70 matching lines @@
           reason, locations, shortcut_info));
 }
 
 void CreateShortcuts(
     ShortcutCreationReason reason,
     const web_app::ShortcutLocations& locations,
     Profile* profile,
     const extensions::Extension* app) {
   DCHECK(BrowserThread::CurrentlyOn(BrowserThread::UI));
 
-  GetInfoForApp(app,
-                profile,
-                base::Bind(&CreateShortcutsWithInfo, reason, locations));
+  internals::GetInfoForApp(
+      app,
+      profile,
+      base::Bind(&CreateShortcutsWithInfo, reason, locations));
 }
 
 void DeleteAllShortcuts(Profile* profile, const extensions::Extension* app) {
   DCHECK(BrowserThread::CurrentlyOn(BrowserThread::UI));
 
   BrowserThread::PostTask(
       BrowserThread::FILE,
       FROM_HERE,
       base::Bind(&DeleteShortcutsOnFileThread,
                  web_app::ShortcutInfoForExtensionAndProfile(app, profile)));
 }
 
 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));
+  internals::GetInfoForApp(
+      app,
+      profile,
+      base::Bind(&UpdateAllShortcutsForShortcutInfo, old_app_title));
 }
 
 bool IsValidUrl(const GURL& url) {
   static const char* const kValidUrlSchemes[] = {
       content::kFileScheme,
       content::kFileSystemScheme,
       content::kFtpScheme,
       content::kHttpScheme,
       content::kHttpsScheme,
       extensions::kExtensionScheme,
@@ skipping 26 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