File association for app shims. (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/file_util.h"
 #include "base/i18n/file_util_icu.h"
@@ skipping 144 matching lines @@
   }
 
   callback.Run(shortcut_info, file_handlers_info);
 }
 
 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(
-      extensions::FileHandlers::GetFileHandlers(extension));
+  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;
 
   std::vector<extensions::ImageLoader::ImageRepresentation> info_list;
   for (size_t i = 0; i < kNumDesiredSizes; ++i) {
     int size = kDesiredSizes[i];
     extensions::ExtensionResource resource =
         extensions::IconsInfo::GetIconResource(
             extension, size, ExtensionIconSet::MATCH_EXACTLY);
     if (!resource.empty()) {
       info_list.push_back(extensions::ImageLoader::ImageRepresentation(
           resource,
@@ skipping 64 matching lines @@
   return base::FilePath(file_name);
 }
 
 bool CreateShortcutsOnFileThread(
     ShortcutCreationReason reason,
     const web_app::ShortcutLocations& locations,
     const web_app::ShortcutInfo& shortcut_info) {
   DCHECK(BrowserThread::CurrentlyOn(BrowserThread::FILE));
 
   return CreateShortcutsWithInfoOnFileThread(
-      reason, locations, shortcut_info, extensions::FileHandlersInfo(NULL));
+      reason, locations, shortcut_info, extensions::FileHandlersInfo());
 }
 
 }  // namespace internals
 
 web_app::ShortcutInfo::ShortcutInfo()
     : is_platform_app(false) {
 }
 
 web_app::ShortcutInfo::~ShortcutInfo() {}
 
@@ skipping 209 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