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

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

Issue 280963002: Move FileHandlersInfo to /extensions and remove struct FileHandlersInfo (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Latest master Created 6 years, 7 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/web_applications/web_app.h ('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 87cd12c09996f85365c6bb954e0ca4e730b34577..02c39bb82f2897601d3c259ea8701392e4d98a09 100644
--- a/chrome/browser/web_applications/web_app.cc
+++ b/chrome/browser/web_applications/web_app.cc
@@ -18,7 +18,6 @@
#include "chrome/browser/profiles/profile.h"
#include "chrome/common/chrome_constants.h"
#include "chrome/common/chrome_version_info.h"
-#include "chrome/common/extensions/api/file_handlers/file_handlers_parser.h"
#include "chrome/common/extensions/manifest_handlers/app_launch_info.h"
#include "chrome/common/pref_names.h"
#include "chrome/common/url_constants.h"
@@ -162,11 +161,10 @@ void GetInfoForApp(const extensions::Extension* extension,
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;
+ extensions::FileHandlersInfo file_handlers_info =
+ file_handlers ? *file_handlers : extensions::FileHandlersInfo();
std::vector<extensions::ImageLoader::ImageRepresentation> info_list;
for (size_t i = 0; i < kNumDesiredSizes; ++i) {
« no previous file with comments | « chrome/browser/web_applications/web_app.h ('k') | chrome/browser/web_applications/web_app_mac.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698