Add option to import from bookmarks html file to "Import Bookmarks..." dialog.

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 157 matching lines @@
   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->source_path.clear();
+  bookmarks_file->app_path.clear();

[Ilya Sherman, 2013/08/08 08:09:28]

nit: These shouldn't be needed, as they ought to happen by default.

[tfarina, 2013/08/10 15:05:39]

Done.

+  bookmarks_file->services_supported = importer::FAVORITES;
+  profiles.push_back(bookmarks_file);
 
   // 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;
 }