diff options
Diffstat (limited to 'chrome/browser/profiles')
| -rw-r--r-- | chrome/browser/profiles/profile_impl.cc | 16 |
1 files changed, 15 insertions, 1 deletions
diff --git a/chrome/browser/profiles/profile_impl.cc b/chrome/browser/profiles/profile_impl.cc index 63e7bd5..4603d6b 100644 --- a/chrome/browser/profiles/profile_impl.cc +++ b/chrome/browser/profiles/profile_impl.cc @@ -515,9 +515,24 @@ void ProfileImpl::RegisterComponentExtensions() { IDR_BOOKMARKS_MANIFEST)); #if defined(FILE_MANAGER_EXTENSION) +#ifndef NDEBUG + const CommandLine* command_line = CommandLine::ForCurrentProcess(); + if (command_line->HasSwitch(switches::kFileManagerExtensionPath)) { + FilePath filemgr_extension_path = + command_line->GetSwitchValuePath(switches::kFileManagerExtensionPath); + component_extensions.push_back(std::make_pair( + filemgr_extension_path.value(), + IDR_FILEMANAGER_MANIFEST)); + } else { component_extensions.push_back(std::make_pair( FILE_PATH_LITERAL("file_manager"), IDR_FILEMANAGER_MANIFEST)); + } +#else + component_extensions.push_back(std::make_pair( + FILE_PATH_LITERAL("file_manager"), + IDR_FILEMANAGER_MANIFEST)); +#endif #endif #if defined(TOUCH_UI) @@ -532,7 +547,6 @@ void ProfileImpl::RegisterComponentExtensions() { IDR_MOBILE_MANIFEST)); #ifndef NDEBUG - const CommandLine* command_line = CommandLine::ForCurrentProcess(); if (command_line->HasSwitch(switches::kAuthExtensionPath)) { FilePath auth_extension_path = command_line->GetSwitchValuePath(switches::kAuthExtensionPath); |