| Index: chrome/browser/importer/firefox_importer_utils.h
|
| diff --git a/chrome/browser/importer/firefox_importer_utils.h b/chrome/browser/importer/firefox_importer_utils.h
|
| index 1ba9bfe7c4825939a149122143e4aa5ea1200aad..f723ba4a8a41e089892880460e1d609366a4cec6 100644
|
| --- a/chrome/browser/importer/firefox_importer_utils.h
|
| +++ b/chrome/browser/importer/firefox_importer_utils.h
|
| @@ -12,12 +12,12 @@
|
| #include "base/string16.h"
|
| #include "build/build_config.h"
|
|
|
| -class FilePath;
|
| class GURL;
|
| class TemplateURL;
|
|
|
| namespace base {
|
| class DictionaryValue;
|
| +class FilePath;
|
| }
|
|
|
| #if defined(OS_WIN)
|
| @@ -29,7 +29,7 @@ int GetCurrentFirefoxMajorVersionFromRegistry();
|
|
|
| // Detects where Firefox lives. Returns an empty path if Firefox is not
|
| // installed.
|
| -FilePath GetFirefoxInstallPathFromRegistry();
|
| +base::FilePath GetFirefoxInstallPathFromRegistry();
|
| #endif // OS_WIN
|
|
|
| #if defined(OS_MACOSX)
|
| @@ -37,21 +37,21 @@ FilePath GetFirefoxInstallPathFromRegistry();
|
| // in order to decoded FF profile passwords.
|
| // The Path is usuall FF App Bundle/Contents/Mac OS/
|
| // Returns empty path on failure.
|
| -FilePath GetFirefoxDylibPath();
|
| +base::FilePath GetFirefoxDylibPath();
|
| #endif // OS_MACOSX
|
|
|
| // Returns the path to the Firefox profile.
|
| -FilePath GetFirefoxProfilePath();
|
| +base::FilePath GetFirefoxProfilePath();
|
|
|
| // Detects version of Firefox and installation path for the given Firefox
|
| // profile.
|
| -bool GetFirefoxVersionAndPathFromProfile(const FilePath& profile_path,
|
| +bool GetFirefoxVersionAndPathFromProfile(const base::FilePath& profile_path,
|
| int* version,
|
| - FilePath* app_path);
|
| + base::FilePath* app_path);
|
|
|
| // Gets the full path of the profiles.ini file. This file records the profiles
|
| // that can be used by Firefox. Returns an empty path if failed.
|
| -FilePath GetProfilesINI();
|
| +base::FilePath GetProfilesINI();
|
|
|
| // Parses the profile.ini file, and stores its information in |root|.
|
| // This file is a plain-text file. Key/value pairs are stored one per line, and
|
| @@ -65,7 +65,7 @@ FilePath GetProfilesINI();
|
| // Path=Profiles/abcdefeg.default
|
| // We set "[value]" in path "<Section>.<Key>". For example, the path
|
| // "Genenral.StartWithLastProfile" has the value "1".
|
| -void ParseProfileINI(const FilePath& file, base::DictionaryValue* root);
|
| +void ParseProfileINI(const base::FilePath& file, base::DictionaryValue* root);
|
|
|
| // Returns true if we want to add the URL to the history. We filter out the URL
|
| // with a unsupported scheme.
|
| @@ -73,16 +73,16 @@ bool CanImportURL(const GURL& url);
|
|
|
| // Parses the OpenSearch XML files in |xml_files| and populates |search_engines|
|
| // with the resulting TemplateURLs.
|
| -void ParseSearchEnginesFromXMLFiles(const std::vector<FilePath>& xml_files,
|
| +void ParseSearchEnginesFromXMLFiles(const std::vector<base::FilePath>& xml_files,
|
| std::vector<TemplateURL*>* search_engines);
|
|
|
| // Returns the home page set in Firefox in a particular profile.
|
| -GURL GetHomepage(const FilePath& profile_path);
|
| +GURL GetHomepage(const base::FilePath& profile_path);
|
|
|
| // Checks to see if this home page is a default home page, as specified by
|
| // the resource file browserconfig.properties in the Firefox application
|
| // directory.
|
| -bool IsDefaultHomepage(const GURL& homepage, const FilePath& app_path);
|
| +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
|
| @@ -90,7 +90,7 @@ bool IsDefaultHomepage(const GURL& homepage, const FilePath& app_path);
|
| // |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 FilePath& pref_file, base::DictionaryValue* 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.
|
| @@ -101,6 +101,6 @@ std::string GetPrefsJsValue(const std::string& prefs,
|
| // This is useful to differentiate between Firefox and Iceweasel.
|
| // If anything goes wrong while trying to obtain the branding name,
|
| // the function assumes it's Firefox.
|
| -string16 GetFirefoxImporterName(const FilePath& app_path);
|
| +string16 GetFirefoxImporterName(const base::FilePath& app_path);
|
|
|
| #endif // CHROME_BROWSER_IMPORTER_FIREFOX_IMPORTER_UTILS_H_
|
|
|