Do not add "Bookmarks File" to ImporterList.

chrome/browser/importer/importer_list.cc

 // Copyright (c) 2012 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_list.h"
 
 #include "base/bind.h"
 #include "chrome/browser/importer/importer_list_observer.h"
 #include "chrome/browser/shell_integration.h"
 #include "chrome/common/importer/firefox_importer_utils.h"
@@ skipping 88 matching lines @@
 
 ImporterList::ImporterList()
     : source_thread_id_(BrowserThread::UI),
       observer_(NULL),
       is_observed_(false),
       source_profiles_loaded_(false) {
 }
 
 void ImporterList::DetectSourceProfiles(
     const std::string& locale,
+    bool include_interactive_profiles,
     importer::ImporterListObserver* observer) {
   DCHECK(observer);
   observer_ = observer;
   is_observed_ = true;
 
   bool res = BrowserThread::GetCurrentThreadIdentifier(&source_thread_id_);
   DCHECK(res);
 
-  BrowserThread::PostTask(
-      BrowserThread::FILE,
-      FROM_HERE,
-      base::Bind(&ImporterList::DetectSourceProfilesWorker, this, locale));
+  BrowserThread::PostTask(BrowserThread::FILE,
+                          FROM_HERE,
+                          base::Bind(&ImporterList::DetectSourceProfilesWorker,
+                                     this,
+                                     locale,
+                                     include_interactive_profiles));
 }
 
-void ImporterList::DetectSourceProfilesHack(const std::string& locale) {
-  DetectSourceProfilesWorker(locale);
+void ImporterList::DetectSourceProfilesHack(const std::string& locale,
+                                            bool include_interactive_profiles) {
+  DetectSourceProfilesWorker(locale, include_interactive_profiles);
 }
 
 const importer::SourceProfile& ImporterList::GetSourceProfileAt(
     size_t index) const {
   DCHECK(source_profiles_loaded_);
   DCHECK_LT(index, count());
   return *source_profiles_[index];
 }
 
 const importer::SourceProfile& ImporterList::GetSourceProfileForImporterType(
     int importer_type) const {
   DCHECK(source_profiles_loaded_);
 
   for (size_t i = 0; i < count(); ++i) {
     if (source_profiles_[i]->importer_type == importer_type)
       return *source_profiles_[i];
   }
   NOTREACHED();
   return *(new importer::SourceProfile);
 }
 
 ImporterList::~ImporterList() {
 }
 
-void ImporterList::DetectSourceProfilesWorker(const std::string& locale) {
+void ImporterList::DetectSourceProfilesWorker(
+    const std::string& locale,
+    bool include_interactive_profiles) {
   // TODO(jhawkins): Remove this condition once DetectSourceProfilesHack is
   // removed.
   if (is_observed_)
     DCHECK(BrowserThread::CurrentlyOn(BrowserThread::FILE));
 
   std::vector<importer::SourceProfile*> profiles;
 
   // The first run import will automatically take settings from the first
   // profile detected, which should be the user's current default.
 #if defined(OS_WIN)
   if (ShellIntegration::IsFirefoxDefaultBrowser()) {
     DetectFirefoxProfiles(locale, &profiles);
     DetectIEProfiles(&profiles);
   } else {
     DetectIEProfiles(&profiles);
     DetectFirefoxProfiles(locale, &profiles);
   }
 #elif defined(OS_MACOSX)
   if (ShellIntegration::IsFirefoxDefaultBrowser()) {
     DetectFirefoxProfiles(locale, &profiles);
     DetectSafariProfiles(&profiles);
   } else {
     DetectSafariProfiles(&profiles);
     DetectFirefoxProfiles(locale, &profiles);
   }
 #else
   DetectFirefoxProfiles(locale, &profiles);
 #endif
-  importer::SourceProfile* bookmarks_file = new importer::SourceProfile;
-  bookmarks_file->importer_name =
-      l10n_util::GetStringUTF16(IDS_IMPORT_FROM_BOOKMARKS_HTML_FILE);
-  bookmarks_file->importer_type = importer::TYPE_BOOKMARKS_FILE;
-  bookmarks_file->services_supported = importer::FAVORITES;
-  profiles.push_back(bookmarks_file);
+  if (include_interactive_profiles) {
+    importer::SourceProfile* bookmarks_profile = new importer::SourceProfile;
+    bookmarks_profile->importer_name =
+        l10n_util::GetStringUTF16(IDS_IMPORT_FROM_BOOKMARKS_HTML_FILE);
+    bookmarks_profile->importer_type = importer::TYPE_BOOKMARKS_FILE;
+    bookmarks_profile->services_supported = importer::FAVORITES;
+    profiles.push_back(bookmarks_profile);
+  }
 
   // TODO(jhawkins): Remove this condition once DetectSourceProfilesHack is
   // removed.
   if (is_observed_) {
     BrowserThread::PostTask(
         source_thread_id_,
         FROM_HERE,
         base::Bind(&ImporterList::SourceProfilesLoaded, this, profiles));
   } else {
     source_profiles_.assign(profiles.begin(), profiles.end());
@@ skipping 14 matching lines @@
   source_profiles_.assign(profiles.begin(), profiles.end());
   source_profiles_loaded_ = true;
   source_thread_id_ = BrowserThread::UI;
 
   observer_->OnSourceProfilesLoaded();
   observer_ = NULL;
 
   // TODO(jhawkins): Remove once DetectSourceProfilesHack is removed.
   is_observed_ = false;
 }