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 /chrome/browser/shell_integration.h | |
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 'chrome/browser/shell_integration.h')
-rw-r--r-- | chrome/browser/shell_integration.h | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/chrome/browser/shell_integration.h b/chrome/browser/shell_integration.h index 2926522..27cdc7c 100644 --- a/chrome/browser/shell_integration.h +++ b/chrome/browser/shell_integration.h @@ -14,7 +14,9 @@ #include "ui/gfx/image/image_family.h" #include "url/gurl.h" +namespace base { class CommandLine; +} class ShellIntegration { public: @@ -160,7 +162,7 @@ class ShellIntegration { // login profile, for ChromeOS). // If |extension_app_id| is non-empty, the arguments use kAppId=<id>. // Otherwise, kApp=<url> is used. - static CommandLine CommandLineArgsForLauncher( + static base::CommandLine CommandLineArgsForLauncher( const GURL& url, const std::string& extension_app_id, const base::FilePath& profile_path); @@ -170,7 +172,7 @@ class ShellIntegration { // The new command line reuses the current process's user data directory and // profile. static void AppendProfileArgs(const base::FilePath& profile_path, - CommandLine* command_line); + base::CommandLine* command_line); #if defined(OS_WIN) // Generates an application user model ID (AppUserModelId) for a given app |