Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(5169)

Unified Diff: chrome/browser/web_applications/web_app.cc

Issue 64803005: File association for app shims. (Mac) (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Missed a comma. Created 6 years, 8 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « chrome/browser/about_flags.cc ('k') | chrome/browser/web_applications/web_app_mac.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/browser/web_applications/web_app.cc
diff --git a/chrome/browser/web_applications/web_app.cc b/chrome/browser/web_applications/web_app.cc
index 135b6f4824ba30d0db978ceb0aa0788580e453dd..313e261886555939c2a2b6fec826a81f97149743 100644
--- a/chrome/browser/web_applications/web_app.cc
+++ b/chrome/browser/web_applications/web_app.cc
@@ -162,8 +162,11 @@ void GetInfoForApp(const extensions::Extension* extension,
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) {
@@ -248,7 +251,7 @@ bool CreateShortcutsOnFileThread(
DCHECK(BrowserThread::CurrentlyOn(BrowserThread::FILE));
return CreateShortcutsWithInfoOnFileThread(
- reason, locations, shortcut_info, extensions::FileHandlersInfo(NULL));
+ reason, locations, shortcut_info, extensions::FileHandlersInfo());
}
} // namespace internals
« no previous file with comments | « chrome/browser/about_flags.cc ('k') | chrome/browser/web_applications/web_app_mac.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698