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

Unified Diff: chrome/browser/jumplist.cc

Issue 280004: Revert wstring patch (r29078 and follow up commits). It is causing failures o... (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/browser/importer/importer_unittest.cc ('k') | chrome/browser/printing/printing_layout_uitest.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/browser/jumplist.cc
===================================================================
--- chrome/browser/jumplist.cc (revision 29084)
+++ chrome/browser/jumplist.cc (working copy)
@@ -486,10 +486,9 @@
// icon directory, and create a new directory which contains new JumpList
// icon files.
std::wstring icon_dir_old(icon_dir_ + L"Old");
- if (file_util::PathExists(FilePath::FromWStringHack(icon_dir_old)))
+ if (file_util::PathExists(icon_dir_old))
file_util::Delete(icon_dir_old, true);
- file_util::Move(FilePath::FromWStringHack(icon_dir_),
- FilePath::FromWStringHack(icon_dir_old));
+ file_util::Move(icon_dir_, icon_dir_old);
file_util::CreateDirectory(icon_dir_);
// Create temporary icon files for shortcuts in the "Most Visited" category.
« no previous file with comments | « chrome/browser/importer/importer_unittest.cc ('k') | chrome/browser/printing/printing_layout_uitest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698