diff options
author | pgal.u-szeged <pgal.u-szeged@partner.samsung.com> | 2014-10-28 04:50:41 -0700 |
---|---|---|
committer | Commit bot <commit-bot@chromium.org> | 2014-10-28 11:51:07 +0000 |
commit | 929d45a9ff9a74eb05453a10b84ba1a27392c1e6 (patch) | |
tree | 4befcf1edf8b39f9e5cfa71abf583c5665230b7a | |
parent | 22a7afcf4d80b75576d8cdb08acb25e5811bc0ac (diff) | |
download | chromium_src-929d45a9ff9a74eb05453a10b84ba1a27392c1e6.zip chromium_src-929d45a9ff9a74eb05453a10b84ba1a27392c1e6.tar.gz chromium_src-929d45a9ff9a74eb05453a10b84ba1a27392c1e6.tar.bz2 |
Prefix CommandLine usege with base namespace (Part 2: android_webview/)
Prefix all CommandLine usage in the android_webview/ directory with
the base:: namespace.
BUG=422426
Review URL: https://codereview.chromium.org/661443003
Cr-Commit-Position: refs/heads/master@{#301593}
-rw-r--r-- | android_webview/browser/browser_view_renderer.cc | 2 | ||||
-rw-r--r-- | android_webview/browser/net/aw_url_request_context_getter.cc | 6 | ||||
-rw-r--r-- | android_webview/common/aw_content_client.cc | 2 | ||||
-rw-r--r-- | android_webview/common/aw_switches.cc | 2 | ||||
-rw-r--r-- | android_webview/lib/main/aw_main_delegate.cc | 2 |
5 files changed, 8 insertions, 6 deletions
diff --git a/android_webview/browser/browser_view_renderer.cc b/android_webview/browser/browser_view_renderer.cc index 5bf8168..51c62f8 100644 --- a/android_webview/browser/browser_view_renderer.cc +++ b/android_webview/browser/browser_view_renderer.cc @@ -39,7 +39,7 @@ uint64 g_memory_override_in_bytes = 0u; // static void BrowserViewRenderer::CalculateTileMemoryPolicy() { - CommandLine* cl = CommandLine::ForCurrentProcess(); + base::CommandLine* cl = base::CommandLine::ForCurrentProcess(); // If the value was overridden on the command line, use the specified value. bool client_hard_limit_bytes_overridden = diff --git a/android_webview/browser/net/aw_url_request_context_getter.cc b/android_webview/browser/net/aw_url_request_context_getter.cc index e37f59e..a0fbed0 100644 --- a/android_webview/browser/net/aw_url_request_context_getter.cc +++ b/android_webview/browser/net/aw_url_request_context_getter.cc @@ -52,7 +52,8 @@ namespace { void ApplyCmdlineOverridesToURLRequestContextBuilder( net::URLRequestContextBuilder* builder) { - const CommandLine& command_line = *CommandLine::ForCurrentProcess(); + const base::CommandLine& command_line = + *base::CommandLine::ForCurrentProcess(); if (command_line.HasSwitch(switches::kHostResolverRules)) { // If hostname remappings were specified on the command-line, layer these // rules on top of the real host resolver. This allows forwarding all @@ -69,7 +70,8 @@ void ApplyCmdlineOverridesToURLRequestContextBuilder( void ApplyCmdlineOverridesToNetworkSessionParams( net::HttpNetworkSession::Params* params) { int value; - const CommandLine& command_line = *CommandLine::ForCurrentProcess(); + const base::CommandLine& command_line = + *base::CommandLine::ForCurrentProcess(); if (command_line.HasSwitch(switches::kTestingFixedHttpPort)) { base::StringToInt(command_line.GetSwitchValueASCII( switches::kTestingFixedHttpPort), &value); diff --git a/android_webview/common/aw_content_client.cc b/android_webview/common/aw_content_client.cc index d345ea4..e20b7b4 100644 --- a/android_webview/common/aw_content_client.cc +++ b/android_webview/common/aw_content_client.cc @@ -28,7 +28,7 @@ namespace android_webview { std::string GetUserAgent() { // "Version/4.0" had been hardcoded in the legacy WebView. std::string product = "Version/4.0 " + GetProduct(); - if (CommandLine::ForCurrentProcess()->HasSwitch( + if (base::CommandLine::ForCurrentProcess()->HasSwitch( switches::kUseMobileUserAgent)) { product += " Mobile"; } diff --git a/android_webview/common/aw_switches.cc b/android_webview/common/aw_switches.cc index 41ec9bd..8a36bb5 100644 --- a/android_webview/common/aw_switches.cc +++ b/android_webview/common/aw_switches.cc @@ -11,7 +11,7 @@ const char kForceAuxiliaryBitmap[] = "force-auxiliary-bitmap"; bool ForceAuxiliaryBitmap() { static bool force_auxiliary_bitmap = - CommandLine::ForCurrentProcess()->HasSwitch(kForceAuxiliaryBitmap); + base::CommandLine::ForCurrentProcess()->HasSwitch(kForceAuxiliaryBitmap); return force_auxiliary_bitmap; } diff --git a/android_webview/lib/main/aw_main_delegate.cc b/android_webview/lib/main/aw_main_delegate.cc index deb5fee..41aaf4a 100644 --- a/android_webview/lib/main/aw_main_delegate.cc +++ b/android_webview/lib/main/aw_main_delegate.cc @@ -54,7 +54,7 @@ bool AwMainDelegate::BasicStartupComplete(int* exit_code) { BrowserViewRenderer::CalculateTileMemoryPolicy(); - CommandLine* cl = CommandLine::ForCurrentProcess(); + base::CommandLine* cl = base::CommandLine::ForCurrentProcess(); cl->AppendSwitch(switches::kEnableBeginFrameScheduling); cl->AppendSwitch(switches::kEnableImplSidePainting); |