summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--chrome_frame/chrome_launcher.cc9
1 files changed, 4 insertions, 5 deletions
diff --git a/chrome_frame/chrome_launcher.cc b/chrome_frame/chrome_launcher.cc
index f742a28..b9af23d 100644
--- a/chrome_frame/chrome_launcher.cc
+++ b/chrome_frame/chrome_launcher.cc
@@ -90,10 +90,10 @@ bool SanitizeAndLaunchChrome(const wchar_t* command_line) {
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 @@ std::wstring GetChromeExecutablePath() {
// 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;