diff options
| author | estade@chromium.org <estade@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2009-10-15 03:41:02 +0000 |
|---|---|---|
| committer | estade@chromium.org <estade@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2009-10-15 03:41:02 +0000 |
| commit | 6ec54c1e86aa5d29c7223a86acbfa850be39c806 (patch) | |
| tree | 8c0be0238c2f35646c3545060375a9032c50b04d /chrome/browser/jumplist.cc | |
| parent | 89f580b14355e7342cff030747d12ec18f8ca012 (diff) | |
| download | chromium_src-6ec54c1e86aa5d29c7223a86acbfa850be39c806.zip chromium_src-6ec54c1e86aa5d29c7223a86acbfa850be39c806.tar.gz chromium_src-6ec54c1e86aa5d29c7223a86acbfa850be39c806.tar.bz2 | |
Revert wstring patch (r29078 and follow up commits). It is causing failures on the buildbots.
TBR=nsylvain
Review URL: http://codereview.chromium.org/280004
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@29085 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/browser/jumplist.cc')
| -rw-r--r-- | chrome/browser/jumplist.cc | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/chrome/browser/jumplist.cc b/chrome/browser/jumplist.cc index 3dd2c55..69c2a9c 100644 --- a/chrome/browser/jumplist.cc +++ b/chrome/browser/jumplist.cc @@ -486,10 +486,9 @@ void JumpListUpdateTask::Run() { // 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. |