diff options
| author | avi@chromium.org <avi@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2009-10-30 16:16:19 +0000 |
|---|---|---|
| committer | avi@chromium.org <avi@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2009-10-30 16:16:19 +0000 |
| commit | a98396cd8879950b01602d5101b92a506baa1889 (patch) | |
| tree | 59ecc9d68ac03a27997205c65cb33546c6d38de8 /chrome/browser/browser_main.cc | |
| parent | e8bac552eec6672febd57c04058c3bd2e3d1279d (diff) | |
| download | chromium_src-a98396cd8879950b01602d5101b92a506baa1889.zip chromium_src-a98396cd8879950b01602d5101b92a506baa1889.tar.gz chromium_src-a98396cd8879950b01602d5101b92a506baa1889.tar.bz2 | |
Use FilePath in UserDataDirDialog to remove the use of FilePath::FromWStringHack.
Patch by tfarina.
BUG=None
TEST=None
Review URL: http://codereview.chromium.org/334017
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@30584 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/browser/browser_main.cc')
| -rw-r--r-- | chrome/browser/browser_main.cc | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/chrome/browser/browser_main.cc b/chrome/browser/browser_main.cc index 2cd48e4..df1947f 100644 --- a/chrome/browser/browser_main.cc +++ b/chrome/browser/browser_main.cc @@ -552,8 +552,7 @@ int BrowserMain(const MainFunctionParams& parameters) { // prompt the user to pick a different user-data-dir and restart chrome // with the new dir. // http://code.google.com/p/chromium/issues/detail?id=11510 - user_data_dir = FilePath::FromWStringHack( - UserDataDirDialog::RunUserDataDirDialog(user_data_dir.ToWStringHack())); + user_data_dir = UserDataDirDialog::RunUserDataDirDialog(user_data_dir); if (!parameters.ui_task && browser_shutdown::delete_resources_on_shutdown) { // Only delete the resources if we're not running tests. If we're running // tests the resources need to be reused as many places in the UI cache |