diff options
author | estade@chromium.org <estade@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2009-10-15 02:12:08 +0000 |
---|---|---|
committer | estade@chromium.org <estade@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2009-10-15 02:12:08 +0000 |
commit | 1f6536a58eced16d5a434d0f134047e78633c84c (patch) | |
tree | 5425e11ff43354ddbfd52eb0db505f8881f16bbe /chrome_frame/chrome_launcher.cc | |
parent | cdb70a70ad4c6076fff85effeb61cfaef2bac429 (diff) | |
download | chromium_src-1f6536a58eced16d5a434d0f134047e78633c84c.zip chromium_src-1f6536a58eced16d5a434d0f134047e78633c84c.tar.gz chromium_src-1f6536a58eced16d5a434d0f134047e78633c84c.tar.bz2 |
Fix chrome frame build.
TBR=xji
Review URL: http://codereview.chromium.org/273064
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@29079 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome_frame/chrome_launcher.cc')
-rw-r--r-- | chrome_frame/chrome_launcher.cc | 9 |
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; |