diff options
| author | jhawkins@chromium.org <jhawkins@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2009-02-27 02:28:16 +0000 |
|---|---|---|
| committer | jhawkins@chromium.org <jhawkins@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2009-02-27 02:28:16 +0000 |
| commit | 344678b2b9e85692bf9ec24afd2593481c38dda1 (patch) | |
| tree | ba3e2c1e6996abcab3b9d0e632a0a77bc4362a3c /chrome/browser/importer/importer.cc | |
| parent | f911f74c395b825df8a1b92158e032a7e971b2a2 (diff) | |
| download | chromium_src-344678b2b9e85692bf9ec24afd2593481c38dda1.zip chromium_src-344678b2b9e85692bf9ec24afd2593481c38dda1.tar.gz chromium_src-344678b2b9e85692bf9ec24afd2593481c38dda1.tar.bz2 | |
Reverting 10564.
Review URL: http://codereview.chromium.org/28244
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@10570 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/browser/importer/importer.cc')
| -rw-r--r-- | chrome/browser/importer/importer.cc | 9 |
1 files changed, 1 insertions, 8 deletions
diff --git a/chrome/browser/importer/importer.cc b/chrome/browser/importer/importer.cc index 9c98362..6a2e59f 100644 --- a/chrome/browser/importer/importer.cc +++ b/chrome/browser/importer/importer.cc @@ -647,14 +647,9 @@ void ImporterHost::DetectFirefoxProfiles() { return; } - DictionaryValue root; -#if defined(OS_WIN) std::wstring ini_file = GetProfilesINI(); + DictionaryValue root; ParseProfileINI(ini_file, &root); -#else - // TODO(port): Do we need to concern ourselves with profiles on posix? - NOTIMPLEMENTED(); -#endif std::wstring source_path; for (int i = 0; ; ++i) { @@ -669,7 +664,6 @@ void ImporterHost::DetectFirefoxProfiles() { root.GetString(current_profile + L".Path", &path)) { ReplaceSubstringsAfterOffset(&path, 0, L"/", L"\\"); -#if defined(OS_WIN) // IsRelative=1 means the folder path would be relative to the // path of profiles.ini. IsRelative=0 refers to a custom profile // location. @@ -679,7 +673,6 @@ void ImporterHost::DetectFirefoxProfiles() { } else { profile_path = path; } -#endif // We only import the default profile when multiple profiles exist, // since the other profiles are used mostly by developers for testing. |