diff options
| author | kuchhal@chromium.org <kuchhal@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2009-06-10 22:15:25 +0000 |
|---|---|---|
| committer | kuchhal@chromium.org <kuchhal@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2009-06-10 22:15:25 +0000 |
| commit | 156e4f0a3b1f7451a0abfa2d9c102561ca32a534 (patch) | |
| tree | 8d3f0d4e9142d554fc5669f6571a1a0bf70e2dae | |
| parent | 6029d8d01d809c7d74d1fd36969c1bcda63b2075 (diff) | |
| download | chromium_src-156e4f0a3b1f7451a0abfa2d9c102561ca32a534.zip chromium_src-156e4f0a3b1f7451a0abfa2d9c102561ca32a534.tar.gz chromium_src-156e4f0a3b1f7451a0abfa2d9c102561ca32a534.tar.bz2 | |
Linux: Fix Firefox profile path for import.
BUG=13270
Review URL: http://codereview.chromium.org/118526
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@18094 0039d316-1c4b-4281-b951-d872f2087c98
| -rw-r--r-- | chrome/browser/importer/importer.cc | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/chrome/browser/importer/importer.cc b/chrome/browser/importer/importer.cc index 01b2aed..e3b1782 100644 --- a/chrome/browser/importer/importer.cc +++ b/chrome/browser/importer/importer.cc @@ -683,10 +683,12 @@ void ImporterHost::DetectFirefoxProfiles() { std::wstring is_relative, path, profile_path; if (root.GetString(current_profile + L".IsRelative", &is_relative) && root.GetString(current_profile + L".Path", &path)) { +#if defined(OS_WIN) string16 path16 = WideToUTF16Hack(path); ReplaceSubstringsAfterOffset( &path16, 0, ASCIIToUTF16("/"), ASCIIToUTF16("\\")); path.assign(UTF16ToWideHack(path16)); +#endif // IsRelative=1 means the folder path would be relative to the // path of profiles.ini. IsRelative=0 refers to a custom profile |