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

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

Issue 13707002: Introduce a file-manager-new-ui flag for the new UI of Files.app. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Fixed. Created 7 years, 9 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/browser_resources.grd ('k') | chrome/browser/resources/file_manager/js/background.js » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
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(
« no previous file with comments | « chrome/browser/browser_resources.grd ('k') | chrome/browser/resources/file_manager/js/background.js » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698