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

Unified Diff: chrome/browser/extensions/chrome_component_extension_resource_manager.cc

Issue 1103943003: Add components/chrome_apps (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 5 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/extensions/DEPS ('k') | chrome/chrome_browser_extensions.gypi » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/browser/extensions/chrome_component_extension_resource_manager.cc
diff --git a/chrome/browser/extensions/chrome_component_extension_resource_manager.cc b/chrome/browser/extensions/chrome_component_extension_resource_manager.cc
index 91546cff5c062a7f8fb3e02e30506adfe12ee135..61321a02d6395475275127995acf9ba52aff2fed 100644
--- a/chrome/browser/extensions/chrome_component_extension_resource_manager.cc
+++ b/chrome/browser/extensions/chrome_component_extension_resource_manager.cc
@@ -12,6 +12,7 @@
#include "grit/theme_resources.h"
#if defined(OS_CHROMEOS)
+#include "components/chrome_apps/chrome_apps_resource_util.h"
#include "ui/file_manager/file_manager_resource_util.h"
#endif
@@ -43,6 +44,13 @@ ChromeComponentExtensionResourceManager() {
kExtraComponentExtensionResources,
arraysize(kExtraComponentExtensionResources));
#if defined(OS_CHROMEOS)
+ size_t chrome_apps_resource_size;
+ const GritResourceMap* chrome_apps_resources =
+ chrome_apps::GetChromeAppsResources(&chrome_apps_resource_size);
+ AddComponentResourceEntries(
+ chrome_apps_resources,
+ chrome_apps_resource_size);
+
size_t file_manager_resource_size;
const GritResourceMap* file_manager_resources =
file_manager::GetFileManagerResources(&file_manager_resource_size);
« no previous file with comments | « chrome/browser/extensions/DEPS ('k') | chrome/chrome_browser_extensions.gypi » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698