Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(8308)

Unified Diff: chrome_frame/chrome_launcher.cc

Issue 271099: Re-try r29078: Remove some deprecated file_util wstring functions. (Closed) Base URL: svn://chrome-svn/chrome/trunk/src/
Patch Set: '' Created 11 years, 2 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « chrome_frame/chrome_launcher.h ('k') | chrome_frame/chrome_tab.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
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;
« no previous file with comments | « chrome_frame/chrome_launcher.h ('k') | chrome_frame/chrome_tab.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698