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 06b606312336fefd04c8f1081bfbde3c58c68efb..72129191334fe33f468b09074d2df99b8521c690 100644 |
--- a/chrome/browser/importer/firefox_importer_utils.h |
+++ b/chrome/browser/importer/firefox_importer_utils.h |
@@ -14,11 +14,17 @@ |
class GURL; |
class TemplateURL; |
+#if defined(OS_WIN) |
// Detects which version of Firefox is installed from registry. Returns its |
// major version, and drops the minor version. Returns 0 if |
// failed. If there are indicators of both FF2 and FF3 it is |
// biased to return the biggest version. |
-int GetCurrentFirefoxMajorVersion(); |
+int GetCurrentFirefoxMajorVersionFromRegistry(); |
+ |
+// Detects where Firefox lives. Returns a empty string if Firefox |
+// is not installed. |
+std::wstring GetFirefoxInstallPathFromRegistry(); |
+#endif |
#if defined(OS_WIN) || defined(OS_LINUX) |
// Detects version of Firefox and installation path from given Firefox profile |
@@ -46,10 +52,6 @@ FilePath GetProfilesINI(); |
void ParseProfileINI(std::wstring file, DictionaryValue* root); |
#endif |
-// Detects where Firefox lives. Returns a empty string if Firefox |
-// is not installed. |
-std::wstring GetFirefoxInstallPath(); |
- |
// Returns true if we want to add the URL to the history. We filter |
// out the URL with a unsupported scheme. |
bool CanImportURL(const GURL& url); |