| Index: chrome_frame/chrome_launcher.cc
|
| ===================================================================
|
| --- chrome_frame/chrome_launcher.cc (revision 29088)
|
| +++ chrome_frame/chrome_launcher.cc (working copy)
|
| @@ -90,10 +90,10 @@
|
| return base::LaunchApp(sanitized.command_line_string(), false, false, NULL);
|
| }
|
|
|
| -std::wstring GetChromeExecutablePath() {
|
| - std::wstring cur_path;
|
| +FilePath GetChromeExecutablePath() {
|
| + FilePath cur_path;
|
| PathService::Get(base::DIR_MODULE, &cur_path);
|
| - file_util::AppendToPath(&cur_path, chrome::kBrowserProcessExecutableName);
|
| + cur_path = cur_path.Append(chrome::kBrowserProcessExecutableName);
|
|
|
| // The installation model for Chrome places the DLLs in a versioned
|
| // sub-folder one down from the Chrome executable. If we fail to find
|
| @@ -101,8 +101,7 @@
|
| // instead.
|
| if (!file_util::PathExists(cur_path)) {
|
| PathService::Get(base::DIR_MODULE, &cur_path);
|
| - file_util::UpOneDirectory(&cur_path);
|
| - file_util::AppendToPath(&cur_path, chrome::kBrowserProcessExecutableName);
|
| + cur_path = cur_path.DirName().Append(chrome::kBrowserProcessExecutableName);
|
| }
|
|
|
| return cur_path;
|
|
|