summaryrefslogtreecommitdiffstats
path: root/win8
diff options
context:
space:
mode:
authorbrettw@chromium.org <brettw@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2014-03-17 23:07:15 +0000
committerbrettw@chromium.org <brettw@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2014-03-17 23:07:15 +0000
commit2f3b1cce4c8d4d6a4b016f4d03fca5ee88348a2c (patch)
tree78766377b2779fe9b9afbc869a97f387b9b3d082 /win8
parent936e85963a6d11c79c7ea774bc41c8729c04693f (diff)
downloadchromium_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 'win8')
-rw-r--r--win8/delegate_execute/command_execute_impl.h2
-rw-r--r--win8/delegate_execute/delegate_execute_operation.h4
-rw-r--r--win8/delegate_execute/delegate_execute_util.h8
3 files changed, 8 insertions, 6 deletions
diff --git a/win8/delegate_execute/command_execute_impl.h b/win8/delegate_execute/command_execute_impl.h
index f27bf7a..72e1085 100644
--- a/win8/delegate_execute/command_execute_impl.h
+++ b/win8/delegate_execute/command_execute_impl.h
@@ -94,7 +94,7 @@ class ATL_NO_VTABLE DECLSPEC_UUID("071BB5F2-85A4-424F-BFE7-5F1609BE4C2C")
EC_HOST_UI_MODE GetLaunchMode();
CComPtr<IShellItemArray> item_array_;
- CommandLine parameters_;
+ base::CommandLine parameters_;
base::FilePath chrome_exe_;
STARTUPINFO start_info_;
base::string16 verb_;
diff --git a/win8/delegate_execute/delegate_execute_operation.h b/win8/delegate_execute/delegate_execute_operation.h
index 91e2231..26bc19e 100644
--- a/win8/delegate_execute/delegate_execute_operation.h
+++ b/win8/delegate_execute/delegate_execute_operation.h
@@ -12,7 +12,9 @@
#include "base/files/file_path.h"
#include "base/strings/string16.h"
+namespace base {
class CommandLine;
+}
namespace delegate_execute {
@@ -43,7 +45,7 @@ class DelegateExecuteOperation {
DelegateExecuteOperation();
~DelegateExecuteOperation();
- bool Init(const CommandLine* cmd_line);
+ bool Init(const base::CommandLine* cmd_line);
OperationType operation_type() const {
return operation_type_;
diff --git a/win8/delegate_execute/delegate_execute_util.h b/win8/delegate_execute/delegate_execute_util.h
index 4f32e96..eee033a 100644
--- a/win8/delegate_execute/delegate_execute_util.h
+++ b/win8/delegate_execute/delegate_execute_util.h
@@ -15,13 +15,13 @@ class FilePath;
namespace delegate_execute {
// Returns a CommandLine with an empty program parsed from |params|.
-CommandLine CommandLineFromParameters(const wchar_t* params);
+base::CommandLine CommandLineFromParameters(const wchar_t* params);
// Returns a CommandLine to launch |chrome_exe| with all switches and arguments
// from |params| plus an optional |argument|.
-CommandLine MakeChromeCommandLine(const base::FilePath& chrome_exe,
- const CommandLine& params,
- const base::string16& argument);
+base::CommandLine MakeChromeCommandLine(const base::FilePath& chrome_exe,
+ const base::CommandLine& params,
+ const base::string16& argument);
// Returns a properly quoted command-line string less the program (argv[0])
// containing |switch|.