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

Unified Diff: chrome/browser/shell_integration.cc

Issue 2850042: Deprecate more old filepath functions. (Closed)
Patch Set: rebase Created 10 years, 5 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
Index: chrome/browser/shell_integration.cc
diff --git a/chrome/browser/shell_integration.cc b/chrome/browser/shell_integration.cc
index 23d9fcb7514ae36b2e1c256a6cf07292c32fb081..1a9cbb54b617d311a13c9bc7f2fa0d114069db2a 100644
--- a/chrome/browser/shell_integration.cc
+++ b/chrome/browser/shell_integration.cc
@@ -18,13 +18,13 @@ std::string ShellIntegration::GetCommandLineArgumentsCommon(const GURL& url,
std::wstring arguments_w;
// Use the same UserDataDir for new launches that we currently have set.
- std::wstring user_data_dir = cmd.GetSwitchValue(switches::kUserDataDir);
- if (!user_data_dir.empty()) {
+ FilePath user_data_dir = cmd.GetSwitchValuePath(switches::kUserDataDir);
+ if (!user_data_dir.value().empty()) {
// Make sure user_data_dir is an absolute path.
if (file_util::AbsolutePath(&user_data_dir) &&
- file_util::PathExists(FilePath::FromWStringHack(user_data_dir))) {
+ file_util::PathExists(user_data_dir)) {
arguments_w += std::wstring(L"--") + ASCIIToWide(switches::kUserDataDir) +
tfarina 2010/07/08 17:33:11 There is a TODO in some other place about using th
Evan Martin 2010/07/08 17:48:47 Done.
- L"=\"" + user_data_dir + L"\" ";
+ L"=\"" + user_data_dir.ToWStringHack() + L"\" ";
}
}

Powered by Google App Engine
This is Rietveld 408576698