diff options
| author | jcampan@chromium.org <jcampan@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2009-09-02 17:18:22 +0000 |
|---|---|---|
| committer | jcampan@chromium.org <jcampan@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2009-09-02 17:18:22 +0000 |
| commit | 057a8553ab9f8cb5cc9cbecf0ddb8a73afe6f6c7 (patch) | |
| tree | 05ed42974e9a8863bfa6c59fd2a9419c8e9ec3d6 /chrome | |
| parent | f103ab7a3af66f93aa6b674598ee8c977917f5f2 (diff) | |
| download | chromium_src-057a8553ab9f8cb5cc9cbecf0ddb8a73afe6f6c7.zip chromium_src-057a8553ab9f8cb5cc9cbecf0ddb8a73afe6f6c7.tar.gz chromium_src-057a8553ab9f8cb5cc9cbecf0ddb8a73afe6f6c7.tar.bz2 | |
Landing the patch of Thiago Farina.
See http://codereview.chromium.org/183025
Removes the deprecated version of PathService::Override that uses std::wstring
and fix the callers.
BUG=None
TEST=None
Review URL: http://codereview.chromium.org/185007
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@25185 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome')
| -rw-r--r-- | chrome/app/chrome_dll_main.cc | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/chrome/app/chrome_dll_main.cc b/chrome/app/chrome_dll_main.cc index 5f7e37f..789f772 100644 --- a/chrome/app/chrome_dll_main.cc +++ b/chrome/app/chrome_dll_main.cc @@ -503,8 +503,8 @@ int ChromeMain(int argc, const char** argv) { #endif // Notice a user data directory override if any - const std::wstring user_data_dir = - parsed_command_line.GetSwitchValue(switches::kUserDataDir); + const FilePath user_data_dir = FilePath::FromWStringHack( + parsed_command_line.GetSwitchValue(switches::kUserDataDir)); if (!user_data_dir.empty()) CHECK(PathService::Override(chrome::DIR_USER_DATA, user_data_dir)); |