Add import progress indicator dialog.

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 25 matching lines @@
 #include "chrome/common/pref_names.h"
 #include "chrome/common/pref_service.h"
 #include "grit/generated_resources.h"
 #include "skia/ext/image_operations.h"
 #include "webkit/glue/image_decoder.h"
 
 // TODO(port): Port these files.
 #if defined(OS_WIN)
 #include "chrome/browser/views/importer_lock_view.h"
 #include "views/window/window.h"
+#elif defined(OS_LINUX)
+#include "chrome/browser/gtk/import_lock_dialog_gtk.h"
 #endif
 
 // ProfileWriter.
 
 bool ProfileWriter::BookmarkModelIsLoaded() const {
   return profile_->GetBookmarkModel()->IsLoaded();
 }
 
 bool ProfileWriter::TemplateURLModelIsLoaded() const {
   return profile_->GetTemplateURLModel()->loaded();
@@ skipping 378 matching lines @@
   InvokeTaskIfDone();
 }
 
 void ImporterHost::ShowWarningDialog() {
   if (headless_) {
     OnLockViewEnd(false);
   } else {
 #if defined(OS_WIN)
     views::Window::CreateChromeWindow(GetActiveWindow(), gfx::Rect(),
                                       new ImporterLockView(this))->Show();
+#elif defined(OS_LINUX)
+    ImportLockDialogGtk::Show(NULL, this);
 #else
     // TODO(port): Need CreateChromeWindow.
     NOTIMPLEMENTED();
 #endif
   }
 }
 
 void ImporterHost::OnLockViewEnd(bool is_continue) {
   if (is_continue) {
     // User chose to continue, then we check the lock again to make
@@ skipping 250 matching lines @@
         // 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();
+  int version = 0;
+#if defined(OS_WIN)
+  version = GetCurrentFirefoxMajorVersionFromRegistry();
+#endif
   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 defined(OS_WIN)
+    firefox->app_path = GetFirefoxInstallPathFromRegistry();
+#endif
     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);
   }
 }