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 /apps/shell | |
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 'apps/shell')
-rw-r--r-- | apps/shell/browser/shell_content_browser_client.h | 2 | ||||
-rw-r--r-- | apps/shell/browser/shell_extensions_browser_client.h | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/apps/shell/browser/shell_content_browser_client.h b/apps/shell/browser/shell_content_browser_client.h index 7de6844..de9331d 100644 --- a/apps/shell/browser/shell_content_browser_client.h +++ b/apps/shell/browser/shell_content_browser_client.h @@ -41,7 +41,7 @@ class ShellContentBrowserClient : public content::ContentBrowserClient { OVERRIDE; virtual void SiteInstanceDeleting(content::SiteInstance* site_instance) OVERRIDE; - virtual void AppendExtraCommandLineSwitches(CommandLine* command_line, + virtual void AppendExtraCommandLineSwitches(base::CommandLine* command_line, int child_process_id) OVERRIDE; virtual void GetAdditionalAllowedSchemesForFileSystem( std::vector<std::string>* additional_schemes) OVERRIDE; diff --git a/apps/shell/browser/shell_extensions_browser_client.h b/apps/shell/browser/shell_extensions_browser_client.h index 4524ec3..d491adf 100644 --- a/apps/shell/browser/shell_extensions_browser_client.h +++ b/apps/shell/browser/shell_extensions_browser_client.h @@ -24,7 +24,7 @@ class ShellExtensionsBrowserClient : public ExtensionsBrowserClient { // ExtensionsBrowserClient overrides: virtual bool IsShuttingDown() OVERRIDE; - virtual bool AreExtensionsDisabled(const CommandLine& command_line, + virtual bool AreExtensionsDisabled(const base::CommandLine& command_line, content::BrowserContext* context) OVERRIDE; virtual bool IsValidContext(content::BrowserContext* context) OVERRIDE; virtual bool IsSameContext(content::BrowserContext* first, |