summaryrefslogtreecommitdiffstats
path: root/chromium/win8/delegate_execute/delegate_execute_util.cc
diff options
context:
space:
mode:
Diffstat (limited to 'chromium/win8/delegate_execute/delegate_execute_util.cc')
-rw-r--r--chromium/win8/delegate_execute/delegate_execute_util.cc12
1 files changed, 6 insertions, 6 deletions
diff --git a/chromium/win8/delegate_execute/delegate_execute_util.cc b/chromium/win8/delegate_execute/delegate_execute_util.cc
index 6a3dc048dbd..78203ed4ec8 100644
--- a/chromium/win8/delegate_execute/delegate_execute_util.cc
+++ b/chromium/win8/delegate_execute/delegate_execute_util.cc
@@ -13,7 +13,7 @@ CommandLine CommandLineFromParameters(const wchar_t* params) {
CommandLine command_line(CommandLine::NO_PROGRAM);
if (params) {
- string16 command_string(L"noprogram.exe ");
+ base::string16 command_string(L"noprogram.exe ");
command_string.append(params);
command_line.ParseFromString(command_string);
command_line.SetProgram(base::FilePath());
@@ -24,7 +24,7 @@ CommandLine CommandLineFromParameters(const wchar_t* params) {
CommandLine MakeChromeCommandLine(const base::FilePath& chrome_exe,
const CommandLine& params,
- const string16& argument) {
+ const base::string16& argument) {
CommandLine chrome_cmd(params);
chrome_cmd.SetProgram(chrome_exe);
@@ -34,16 +34,16 @@ CommandLine MakeChromeCommandLine(const base::FilePath& chrome_exe,
return chrome_cmd;
}
-string16 ParametersFromSwitch(const char* a_switch) {
+base::string16 ParametersFromSwitch(const char* a_switch) {
if (!a_switch)
- return string16();
+ return base::string16();
CommandLine cmd_line(CommandLine::NO_PROGRAM);
cmd_line.AppendSwitch(a_switch);
- string16 command_string(cmd_line.GetCommandLineString());
- TrimWhitespace(command_string, TRIM_ALL, &command_string);
+ base::string16 command_string(cmd_line.GetCommandLineString());
+ base::TrimWhitespace(command_string, base::TRIM_ALL, &command_string);
return command_string;
}