diff options
| author | peter@chromium.org <peter@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-07-19 15:57:13 +0000 |
|---|---|---|
| committer | peter@chromium.org <peter@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-07-19 15:57:13 +0000 |
| commit | a8b7a15ff429ecfca9e0ae4446b734cad0648a54 (patch) | |
| tree | f458e9cc33a1229fafc9cb567686d7f788eef769 /chrome/common/importer/firefox_importer_utils.h | |
| parent | 7d12ee16699e8f611f4d1e367a0485a444957386 (diff) | |
| download | chromium_src-a8b7a15ff429ecfca9e0ae4446b734cad0648a54.zip chromium_src-a8b7a15ff429ecfca9e0ae4446b734cad0648a54.tar.gz chromium_src-a8b7a15ff429ecfca9e0ae4446b734cad0648a54.tar.bz2 | |
Revert 212579 "Move firefox_proxy_settings* out of importer."
> Move firefox_proxy_settings* out of importer.
>
> Apparently FirefoxProxySettings has nothing to do with importer/, it's use only
> by c/b/net. So per request we move it there.
>
> BUG=258876
> TEST=unit_tests
> TBR=eroman@chromium.org, gab@chromium.org, thestig@chromium.org
>
> Review URL: https://codereview.chromium.org/18612016
TBR=tfarina@chromium.org
Review URL: https://codereview.chromium.org/19786003
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@212589 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/common/importer/firefox_importer_utils.h')
| -rw-r--r-- | chrome/common/importer/firefox_importer_utils.h | 9 |
1 files changed, 9 insertions, 0 deletions
diff --git a/chrome/common/importer/firefox_importer_utils.h b/chrome/common/importer/firefox_importer_utils.h index 54c5a74..09da571 100644 --- a/chrome/common/importer/firefox_importer_utils.h +++ b/chrome/common/importer/firefox_importer_utils.h @@ -84,6 +84,15 @@ GURL GetHomepage(const base::FilePath& profile_path); // directory. bool IsDefaultHomepage(const GURL& homepage, const base::FilePath& app_path); +// Parses the prefs found in the file |pref_file| and puts the key/value pairs +// in |prefs|. Keys are strings, and values can be strings, booleans or +// integers. Returns true if it succeeded, false otherwise (in which case +// |prefs| is not filled). +// Note: for strings, only valid UTF-8 string values are supported. If a +// key/pair is not valid UTF-8, it is ignored and will not appear in |prefs|. +bool ParsePrefFile(const base::FilePath& pref_file, + base::DictionaryValue* prefs); + // Parses the value of a particular firefox preference from a string that is the // contents of the prefs file. std::string GetPrefsJsValue(const std::string& prefs, |