diff options
author | brettw@chromium.org <brettw@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2014-03-17 23:07:15 +0000 |
---|---|---|
committer | brettw@chromium.org <brettw@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2014-03-17 23:07:15 +0000 |
commit | 2f3b1cce4c8d4d6a4b016f4d03fca5ee88348a2c (patch) | |
tree | 78766377b2779fe9b9afbc869a97f387b9b3d082 /android_webview/browser | |
parent | 936e85963a6d11c79c7ea774bc41c8729c04693f (diff) | |
download | chromium_src-2f3b1cce4c8d4d6a4b016f4d03fca5ee88348a2c.zip chromium_src-2f3b1cce4c8d4d6a4b016f4d03fca5ee88348a2c.tar.gz chromium_src-2f3b1cce4c8d4d6a4b016f4d03fca5ee88348a2c.tar.bz2 |
Move CommandLine to base namespace.
Fix all forward-declares and header files referencing CommandLine.
This keeps a "using base::CommandLine" in the command line header file so that the rest of the source files can be changes in a follow-up.
TBR=sky
Review URL: https://codereview.chromium.org/196413016
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@257514 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'android_webview/browser')
-rw-r--r-- | android_webview/browser/aw_content_browser_client.cc | 2 | ||||
-rw-r--r-- | android_webview/browser/aw_content_browser_client.h | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/android_webview/browser/aw_content_browser_client.cc b/android_webview/browser/aw_content_browser_client.cc index 90f4def..b1edcfd 100644 --- a/android_webview/browser/aw_content_browser_client.cc +++ b/android_webview/browser/aw_content_browser_client.cc @@ -237,7 +237,7 @@ std::string AwContentBrowserClient::GetCanonicalEncodingNameByAliasName( } void AwContentBrowserClient::AppendExtraCommandLineSwitches( - CommandLine* command_line, + base::CommandLine* command_line, int child_process_id) { NOTREACHED() << "Android WebView does not support multi-process yet"; } diff --git a/android_webview/browser/aw_content_browser_client.h b/android_webview/browser/aw_content_browser_client.h index eb601cd..28dc4d0 100644 --- a/android_webview/browser/aw_content_browser_client.h +++ b/android_webview/browser/aw_content_browser_client.h @@ -55,7 +55,7 @@ class AwContentBrowserClient : public content::ContentBrowserClient { content::ProtocolHandlerScopedVector protocol_interceptors) OVERRIDE; virtual std::string GetCanonicalEncodingNameByAliasName( const std::string& alias_name) OVERRIDE; - virtual void AppendExtraCommandLineSwitches(CommandLine* command_line, + virtual void AppendExtraCommandLineSwitches(base::CommandLine* command_line, int child_process_id) OVERRIDE; virtual std::string GetApplicationLocale() OVERRIDE; virtual std::string GetAcceptLangs(content::BrowserContext* context) OVERRIDE; |