Index: chrome/browser/extensions/component_loader.cc |
diff --git a/chrome/browser/extensions/component_loader.cc b/chrome/browser/extensions/component_loader.cc |
index 5f4da14d79716c9aa494bbf54af523e440e2a300..d12d85df4b85916c40fd4c9e78ee2714150b23fa 100644 |
--- a/chrome/browser/extensions/component_loader.cc |
+++ b/chrome/browser/extensions/component_loader.cc |
@@ -239,9 +239,13 @@ bool ComponentLoader::Exists(const std::string& id) const { |
void ComponentLoader::AddFileManagerExtension() { |
#if defined(FILE_MANAGER_EXTENSION) |
const CommandLine* command_line = CommandLine::ForCurrentProcess(); |
- int manifest_id = command_line->HasSwitch(switches::kFileManagerPackaged) ? |
- IDR_FILEMANAGER_MANIFEST : |
- IDR_FILEMANAGER_MANIFEST_V1; |
+ int manifest_id; |
+ if (command_line->HasSwitch(switches::kFileManagerPackaged)) |
+ manifest_id = IDR_FILEMANAGER_MANIFEST; |
+ else if (command_line->HasSwitch(switches::kFileManagerNewUI)) |
+ manifest_id = IDR_FILEMANAGER_MANIFEST_NEW_UI; |
+ else |
+ manifest_id = IDR_FILEMANAGER_MANIFEST_V1; |
#ifndef NDEBUG |
if (command_line->HasSwitch(switches::kFileManagerExtensionPath)) { |
base::FilePath filemgr_extension_path( |