| Index: win8/delegate_execute/delegate_execute_util.cc
|
| diff --git a/win8/delegate_execute/delegate_execute_util.cc b/win8/delegate_execute/delegate_execute_util.cc
|
| index 6a3dc048dbd3f81f9f5ccf81c8d18215c4fc43fa..c3097a2a5ac50805b91223c5f6663cb5f24b8247 100644
|
| --- a/win8/delegate_execute/delegate_execute_util.cc
|
| +++ b/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,15 +34,15 @@ 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());
|
| + base::string16 command_string(cmd_line.GetCommandLineString());
|
| TrimWhitespace(command_string, TRIM_ALL, &command_string);
|
| return command_string;
|
| }
|
|
|