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

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

Issue 2805183002: Make ZIP archiver a component extension. (Closed)
Patch Set: Move the command line check into the function body. Created 3 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
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 6f71f0df06185f07e568cde1041d468875d6944b..ad24c835a2946a0566aa8f7ab981f710103b6b48 100644
--- a/chrome/browser/extensions/chrome_component_extension_resource_manager.cc
+++ b/chrome/browser/extensions/chrome_component_extension_resource_manager.cc
@@ -16,6 +16,7 @@
#if defined(OS_CHROMEOS)
#include "components/chrome_apps/chrome_apps_resource_util.h"
#include "ui/file_manager/file_manager_resource_util.h"
+#include "ui/file_manager/grit/file_manager_resources.h"
#endif
#if defined(USE_AURA)
@@ -35,6 +36,9 @@ ChromeComponentExtensionResourceManager() {
{"webstore_widget/app/icons/icon_16.png", IDR_WEBSTORE_ICON_16},
{"webstore_widget/app/icons/icon_32.png", IDR_WEBSTORE_ICON_32},
{"webstore_widget/app/icons/icon_128.png", IDR_WEBSTORE_ICON},
+#ifndef DISABLE_NACL
+ {"zip_archiver/zip_archiver_pnacl.pexe.js", IDR_ZIP_ARCHIVER_PEXE},
+#endif
#endif
};

Powered by Google App Engine
This is Rietveld 408576698