diff options
author | brettw@chromium.org <brettw@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2014-08-11 20:32:09 +0000 |
---|---|---|
committer | brettw@chromium.org <brettw@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2014-08-11 20:33:10 +0000 |
commit | 47927870b2846d4ebb76885d637572af018cc064 (patch) | |
tree | 6d2187b16e3674b8b219cf164429b5ceb3e54010 /content/app/content_main_runner.cc | |
parent | 7dee27d248d310f70d51b7e1729c5bd474c5b453 (diff) | |
download | chromium_src-47927870b2846d4ebb76885d637572af018cc064.zip chromium_src-47927870b2846d4ebb76885d637572af018cc064.tar.gz chromium_src-47927870b2846d4ebb76885d637572af018cc064.tar.bz2 |
Add base:: qualification to some COmmandLine references in content.
TBR=sky
Review URL: https://codereview.chromium.org/456513002
Cr-Commit-Position: refs/heads/master@{#288787}
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@288787 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'content/app/content_main_runner.cc')
-rw-r--r-- | content/app/content_main_runner.cc | 26 |
1 files changed, 15 insertions, 11 deletions
diff --git a/content/app/content_main_runner.cc b/content/app/content_main_runner.cc index ba132cb..e9aebce 100644 --- a/content/app/content_main_runner.cc +++ b/content/app/content_main_runner.cc @@ -190,7 +190,7 @@ void CommonSubprocessInit(const std::string& process_type) { // Only needed on Windows for creating stats tables. #if defined(OS_WIN) -static base::ProcessId GetBrowserPid(const CommandLine& command_line) { +static base::ProcessId GetBrowserPid(const base::CommandLine& command_line) { base::ProcessId browser_pid = base::GetCurrentProcId(); if (command_line.HasSwitch(switches::kProcessChannelID)) { std::string channel_name = @@ -205,7 +205,7 @@ static base::ProcessId GetBrowserPid(const CommandLine& command_line) { } #endif -static void InitializeStatsTable(const CommandLine& command_line) { +static void InitializeStatsTable(const base::CommandLine& command_line) { // Initialize the Stats Counters table. With this initialized, // the StatsViewer can be utilized to read counters outside of // Chrome. These lines can be commented out to effectively turn @@ -258,7 +258,7 @@ class ContentClientInitializer { content_client->plugin_ = &g_empty_content_plugin_client.Get(); // Single process not supported in split dll mode. } else if (process_type == switches::kRendererProcess || - CommandLine::ForCurrentProcess()->HasSwitch( + base::CommandLine::ForCurrentProcess()->HasSwitch( switches::kSingleProcess)) { if (delegate) content_client->renderer_ = delegate->CreateContentRendererClient(); @@ -267,7 +267,7 @@ class ContentClientInitializer { } if (process_type == switches::kUtilityProcess || - CommandLine::ForCurrentProcess()->HasSwitch( + base::CommandLine::ForCurrentProcess()->HasSwitch( switches::kSingleProcess)) { if (delegate) content_client->utility_ = delegate->CreateContentUtilityClient(); @@ -320,7 +320,8 @@ int RunZygote(const MainFunctionParams& main_function_params, // Zygote::HandleForkRequest may have reallocated the command // line so update it here with the new version. - const CommandLine& command_line = *CommandLine::ForCurrentProcess(); + const base::CommandLine& command_line = + *base::CommandLine::ForCurrentProcess(); std::string process_type = command_line.GetSwitchValueASCII(switches::kProcessType); ContentClientInitializer::Set(process_type, delegate); @@ -356,7 +357,7 @@ static void RegisterMainThreadFactories() { GpuProcessHost::RegisterGpuMainThreadFactory( CreateInProcessGpuThread); #else - CommandLine& command_line = *CommandLine::ForCurrentProcess(); + base::CommandLine& command_line = *base::CommandLine::ForCurrentProcess(); if (command_line.HasSwitch(switches::kSingleProcess)) { LOG(FATAL) << "--single-process is not supported in chrome multiple dll browser."; @@ -589,7 +590,7 @@ class ContentMainRunnerImpl : public ContentMainRunner { argv = params.argv; #endif - CommandLine::Init(argc, argv); + base::CommandLine::Init(argc, argv); if (!delegate_ || delegate_->ShouldEnableTerminationOnHeapCorruption()) base::EnableTerminationOnHeapCorruption(); @@ -606,7 +607,8 @@ class ContentMainRunnerImpl : public ContentMainRunner { completed_basic_startup_ = true; - const CommandLine& command_line = *CommandLine::ForCurrentProcess(); + const base::CommandLine& command_line = + *base::CommandLine::ForCurrentProcess(); std::string process_type = command_line.GetSwitchValueASCII(switches::kProcessType); @@ -745,9 +747,10 @@ class ContentMainRunnerImpl : public ContentMainRunner { virtual int Run() OVERRIDE { DCHECK(is_initialized_); DCHECK(!is_shutdown_); - const CommandLine& command_line = *CommandLine::ForCurrentProcess(); + const base::CommandLine& command_line = + *base::CommandLine::ForCurrentProcess(); std::string process_type = - command_line.GetSwitchValueASCII(switches::kProcessType); + command_line.GetSwitchValueASCII(switches::kProcessType); MainFunctionParams main_params(command_line); main_params.ui_task = ui_task_; @@ -769,7 +772,8 @@ class ContentMainRunnerImpl : public ContentMainRunner { DCHECK(!is_shutdown_); if (completed_basic_startup_ && delegate_) { - const CommandLine& command_line = *CommandLine::ForCurrentProcess(); + const base::CommandLine& command_line = + *base::CommandLine::ForCurrentProcess(); std::string process_type = command_line.GetSwitchValueASCII(switches::kProcessType); |