Add import progress indicator dialog.

chrome/browser/importer/firefox_importer_utils.cc

 // Copyright (c) 2006-2008 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "chrome/browser/importer/firefox_importer_utils.h"
 
 #include <algorithm>
 
 #if defined(OS_WIN)
 #include <shlobj.h>
@@ skipping 65 matching lines @@
   // Sets the SetDllDirectory function pointer to activates this object.
   void set_func(SetDllDirectoryFunc func) { func_ = func; }
 
  private:
   SetDllDirectoryFunc func_;
 };
 #endif
 
 }  // namespace
 
-int GetCurrentFirefoxMajorVersion() {
 #if defined(OS_WIN)
+int GetCurrentFirefoxMajorVersionFromRegistry() {
   TCHAR ver_buffer[128];
   DWORD ver_buffer_length = sizeof(ver_buffer);
   int highest_version = 0;
   // When installing Firefox with admin account, the product keys will be
   // written under HKLM\Mozilla. Otherwise it the keys will be written under
   // HKCU\Mozilla.
   for (int i = 0; i < arraysize(kFireFoxRegistryPaths); ++i) {
     bool result = ReadFromRegistry(kFireFoxRegistryPaths[i],
         L"Software\\Mozilla\\Mozilla Firefox",
         L"CurrentVersion", ver_buffer, &ver_buffer_length);
     if (!result)
       continue;
     highest_version = std::max(highest_version, _wtoi(ver_buffer));
   }
   return highest_version;
-#else
-  // TODO(port): Read in firefox configuration.
-  NOTIMPLEMENTED();
-  return 0;
+}
+
+std::wstring GetFirefoxInstallPathFromRegistry() {
+  // Detects the path that Firefox is installed in.
+  std::wstring registry_path = L"Software\\Mozilla\\Mozilla Firefox";
+  TCHAR buffer[MAX_PATH];
+  DWORD buffer_length = sizeof(buffer);
+  bool result;
+  result = ReadFromRegistry(HKEY_LOCAL_MACHINE, registry_path.c_str(),
+                            L"CurrentVersion", buffer, &buffer_length);
+  if (!result)
+    return std::wstring();
+  registry_path += L"\\" + std::wstring(buffer) + L"\\Main";
+  buffer_length = sizeof(buffer);
+  result = ReadFromRegistry(HKEY_LOCAL_MACHINE, registry_path.c_str(),
+                            L"Install Directory", buffer, &buffer_length);
+  if (!result)
+    return std::wstring();
+  return buffer;
+}
 #endif
-}
 
 #if defined(OS_WIN) || defined(OS_LINUX)
 bool GetFirefoxVersionAndPathFromProfile(const std::wstring& profile_path,
                                          int* version,
                                          std::wstring* app_path) {
   bool ret = false;
   std::wstring compatibility_file(profile_path);
   file_util::AppendToPath(&compatibility_file, L"compatibility.ini");
   std::string content;
   file_util::ReadFileToString(compatibility_file, &content);
@@ skipping 83 matching lines @@
         // so we discard them.
         if (current_section.find(L'.') == std::wstring::npos &&
             key.find(L'.') == std::wstring::npos)
           root->SetString(current_section + L"." + key, value);
       }
     }
   }
 }
 #endif
 
-std::wstring GetFirefoxInstallPath() {
-#if defined(OS_WIN)
-  // Detects the path that Firefox is installed in.
-  std::wstring registry_path = L"Software\\Mozilla\\Mozilla Firefox";
-  TCHAR buffer[MAX_PATH];
-  DWORD buffer_length = sizeof(buffer);
-  bool result;
-  result = ReadFromRegistry(HKEY_LOCAL_MACHINE, registry_path.c_str(),
-                            L"CurrentVersion", buffer, &buffer_length);
-  if (!result)
-    return std::wstring();
-  registry_path += L"\\" + std::wstring(buffer) + L"\\Main";
-  buffer_length = sizeof(buffer);
-  result = ReadFromRegistry(HKEY_LOCAL_MACHINE, registry_path.c_str(),
-                            L"Install Directory", buffer, &buffer_length);
-  if (!result)
-    return std::wstring();
-  return buffer;
-#else
-  // TODO(port): Load firefox configuration.
-  NOTIMPLEMENTED();
-  return std::wstring();
-#endif
-}
-
 bool CanImportURL(const GURL& url) {
   const char* kInvalidSchemes[] = {"wyciwyg", "place", "about", "chrome"};
 
   // The URL is not valid.
   if (!url.is_valid())
     return false;
 
   // Filter out the URLs with unsupported schemes.
   for (size_t i = 0; i < arraysize(kInvalidSchemes); ++i) {
     if (url.SchemeIs(kInvalidSchemes[i]))
@@ skipping 558 matching lines @@
       }
       // Version 3 has an extra line for further use.
       if (version == 3) {
         ++begin;
       }
 
       forms->push_back(form);
     }
   }
 }