Add import settings dialog on linux.

chrome/browser/importer/importer.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/importer.h"
 
 #include <map>
 #include <set>
 
 #include "app/gfx/favicon_size.h"
@@ skipping 497 matching lines @@
       profile_info.browser_type == FIREFOX3) {
     firefox_lock_.reset(new FirefoxProfileLock(profile_info.source_path));
     if (!firefox_lock_->HasAcquired()) {
       // If fail to acquire the lock, we set the source unreadable and
       // show a warning dialog.
       is_source_readable_ = false;
       ShowWarningDialog();
     }
   }
 
-  #if defined(OS_WIN)
+#if defined(OS_WIN)
   // For google toolbar import, we need the user to log in and store their GAIA
   // credentials.
   if (profile_info.browser_type == GOOGLE_TOOLBAR5) {
     if (!toolbar_importer_utils::IsGoogleGAIACookieInstalled()) {
       win_util::MessageBox(
           NULL,
           l10n_util::GetString(IDS_IMPORTER_GOOGLE_LOGIN_TEXT).c_str(),
           L"",
           MB_OK | MB_TOPMOST);
 
@@ skipping 141 matching lines @@
   ie->browser_type = MS_IE;
   ie->source_path.clear();
   ie->app_path.clear();
   ie->services_supported = HISTORY | FAVORITES | COOKIES | PASSWORDS |
       SEARCH_ENGINES;
   source_profiles_.push_back(ie);
 }
 #endif
 
 void ImporterHost::DetectFirefoxProfiles() {
-  // Detects which version of Firefox is installed.
-  int version = GetCurrentFirefoxMajorVersion();
-  ProfileType firefox_type;
-  if (version == 2) {
-    firefox_type = FIREFOX2;
-  } else if (version == 3) {
-    firefox_type = FIREFOX3;
-  } else {
-    // Ignores other versions of firefox.
-    return;
-  }
-
+#if defined(OS_MACOSX)
+  NOTIMPLEMENTED();
+#else
   DictionaryValue root;
-#if defined(OS_WIN)
-  std::wstring ini_file = GetProfilesINI();
+  std::wstring ini_file = GetProfilesINI().ToWStringHack();
   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) {
     std::wstring current_profile = L"Profile" + IntToWString(i);
     if (!root.HasKey(current_profile)) {
       // Profiles are continuously numbered. So we exit when we can't
       // find the i-th one.
       break;
     }
     std::wstring is_relative, path, profile_path;
     if (root.GetString(current_profile + L".IsRelative", &is_relative) &&
         root.GetString(current_profile + L".Path", &path)) {
       string16 path16 = WideToUTF16Hack(path);
       ReplaceSubstringsAfterOffset(
           &path16, 0, ASCIIToUTF16("/"), ASCIIToUTF16("\\"));
       path.assign(UTF16ToWideHack(path16));
 
-#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.
       if (is_relative == L"1") {
         profile_path = file_util::GetDirectoryFromPath(ini_file);
         file_util::AppendToPath(&profile_path, path);
       } 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.
       // Otherwise, Profile0 will be imported.
       std::wstring is_default;
       if ((root.GetString(current_profile + L".Default", &is_default) &&
            is_default == L"1") || i == 0) {
         source_path = profile_path;
         // We break out of the loop when we have found the default profile.
         if (is_default == L"1")
           break;
       }
     }
   }
 
+  // Detects which version of Firefox is installed.
+  ProfileType firefox_type;
+  std::wstring app_path;
+  int version = GetCurrentFirefoxMajorVersion();
+  if (version != 2 && version != 3)
+    GetFirefoxVersionAndPathFromProfile(source_path, &version, &app_path);
+  if (version == 2) {
+    firefox_type = FIREFOX2;
+  } else if (version == 3) {
+    firefox_type = FIREFOX3;
+  } else {
+    // Ignores other versions of firefox.
+    return;
+  }
+
   if (!source_path.empty()) {
     ProfileInfo* firefox = new ProfileInfo();
     firefox->description = l10n_util::GetString(IDS_IMPORT_FROM_FIREFOX);
     firefox->browser_type = firefox_type;
     firefox->source_path = source_path;
     firefox->app_path = GetFirefoxInstallPath();
+    if (firefox->app_path.empty())
+      firefox->app_path = app_path;
     firefox->services_supported = HISTORY | FAVORITES | COOKIES | PASSWORDS |
         SEARCH_ENGINES;
     source_profiles_.push_back(firefox);
   }
+#endif
 }
 
 void ImporterHost::DetectGoogleToolbarProfiles() {
   if (!FirstRun::IsChromeFirstRun()) {
     ProfileInfo* google_toolbar = new ProfileInfo();
     google_toolbar->browser_type = GOOGLE_TOOLBAR5;
     google_toolbar->description = l10n_util::GetString(
                                   IDS_IMPORT_FROM_GOOGLE_TOOLBAR);
     google_toolbar->source_path.clear();
     google_toolbar->app_path.clear();
     google_toolbar->services_supported = FAVORITES;
     source_profiles_.push_back(google_toolbar);
   }
 }