| Index: chrome/browser/extensions/component_loader.cc
|
| diff --git a/chrome/browser/extensions/component_loader.cc b/chrome/browser/extensions/component_loader.cc
|
| index 907d8a7df3431b2c8e3df0d9667e62a1bbc4b51e..dab19d09e29590c0d776134629d4dcfc40a78495 100644
|
| --- a/chrome/browser/extensions/component_loader.cc
|
| +++ b/chrome/browser/extensions/component_loader.cc
|
| @@ -268,7 +268,8 @@ bool ComponentLoader::Exists(const std::string& id) const {
|
| void ComponentLoader::AddFileManagerExtension() {
|
| #if defined(OS_CHROMEOS)
|
| #ifndef NDEBUG
|
| - const CommandLine* command_line = CommandLine::ForCurrentProcess();
|
| + const base::CommandLine* command_line =
|
| + base::CommandLine::ForCurrentProcess();
|
| if (command_line->HasSwitch(switches::kFileManagerExtensionPath)) {
|
| base::FilePath filemgr_extension_path(
|
| command_line->GetSwitchValuePath(switches::kFileManagerExtensionPath));
|
| @@ -355,7 +356,8 @@ void ComponentLoader::AddChromeVoxExtension(
|
| base::FilePath chromevox_path =
|
| resources_path.Append(extension_misc::kChromeVoxExtensionPath);
|
|
|
| - const CommandLine* command_line = CommandLine::ForCurrentProcess();
|
| + const base::CommandLine* command_line =
|
| + base::CommandLine::ForCurrentProcess();
|
| bool is_guest = command_line->HasSwitch(chromeos::switches::kGuestSession);
|
| const char* manifest_filename =
|
| is_guest ? extension_misc::kChromeVoxGuestManifestFilename
|
| @@ -383,7 +385,8 @@ void ComponentLoader::AddChromeVoxExtensionWithManifest(
|
| }
|
|
|
| std::string ComponentLoader::AddChromeOsSpeechSynthesisExtension() {
|
| - const CommandLine* command_line = CommandLine::ForCurrentProcess();
|
| + const base::CommandLine* command_line =
|
| + base::CommandLine::ForCurrentProcess();
|
| int idr = command_line->HasSwitch(chromeos::switches::kGuestSession) ?
|
| IDR_SPEECH_SYNTHESIS_GUEST_MANIFEST : IDR_SPEECH_SYNTHESIS_MANIFEST;
|
| std::string id = Add(idr,
|
| @@ -459,7 +462,8 @@ void ComponentLoader::AddDefaultComponentExtensions(
|
|
|
| // Skip all other extensions that require user session presence.
|
| if (!skip_session_components) {
|
| - const CommandLine* command_line = CommandLine::ForCurrentProcess();
|
| + const base::CommandLine* command_line =
|
| + base::CommandLine::ForCurrentProcess();
|
| if (!command_line->HasSwitch(chromeos::switches::kGuestSession))
|
| Add(IDR_BOOKMARKS_MANIFEST,
|
| base::FilePath(FILE_PATH_LITERAL("bookmark_manager")));
|
| @@ -501,7 +505,8 @@ void ComponentLoader::AddDefaultComponentExtensionsForKioskMode(
|
|
|
| void ComponentLoader::AddDefaultComponentExtensionsWithBackgroundPages(
|
| bool skip_session_components) {
|
| - const CommandLine* command_line = CommandLine::ForCurrentProcess();
|
| + const base::CommandLine* command_line =
|
| + base::CommandLine::ForCurrentProcess();
|
|
|
| // Component extensions with background pages are not enabled during tests
|
| // because they generate a lot of background behavior that can interfere.
|
| @@ -637,7 +642,8 @@ void ComponentLoader::UnloadComponent(ComponentExtensionInfo* component) {
|
|
|
| void ComponentLoader::EnableFileSystemInGuestMode(const std::string& id) {
|
| #if defined(OS_CHROMEOS)
|
| - const CommandLine* command_line = CommandLine::ForCurrentProcess();
|
| + const base::CommandLine* command_line =
|
| + base::CommandLine::ForCurrentProcess();
|
| if (command_line->HasSwitch(chromeos::switches::kGuestSession)) {
|
| // TODO(dpolukhin): Hack to enable HTML5 temporary file system for
|
| // the extension. Some component extensions don't work without temporary
|
|
|