While importing favicon, make sure there is an entry in the history db.

This will match with what history db does for regular bookmarked URLs with favicons - when history db is cleaned, we keep an entry in the db with 0 visits as long as that url is bookmarked.

BUG=13338

Review URL: http://codereview.chromium.org/193053

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@26014 0039d316-1c4b-4281-b951-d872f2087c98

1 files changed, 6 insertions, 6 deletions

diff --git a/chrome/browser/views/importing_progress_view.cc b/chrome/browser/views/importing_progress_view.cc
index d2545f6..ed58f9c 100644
--- a/chrome/browser/views/importing_progress_view.cc
+++ b/chrome/browser/views/importing_progress_view.cc
@@ -254,6 +254,12 @@ void ImportingProgressView::InitControlLayout() {
   layout->AddView(label_info_);
   layout->AddPaddingRow(0, kUnrelatedControlVerticalSpacing);
 
+  if (items_ & HISTORY) {
+    layout->StartRow(0, double_column_view_set_id);
+    layout->AddView(state_history_.get());
+    layout->AddView(label_history_.get());
+    layout->AddPaddingRow(0, kRelatedControlVerticalSpacing);
+  }
   if (items_ & FAVORITES && !bookmarks_import_) {
     layout->StartRow(0, double_column_view_set_id);
     layout->AddView(state_bookmarks_.get());
@@ -272,12 +278,6 @@ void ImportingProgressView::InitControlLayout() {
     layout->AddView(label_passwords_.get());
     layout->AddPaddingRow(0, kRelatedControlVerticalSpacing);
   }
-  if (items_ & HISTORY) {
-    layout->StartRow(0, double_column_view_set_id);
-    layout->AddView(state_history_.get());
-    layout->AddView(label_history_.get());
-    layout->AddPaddingRow(0, kRelatedControlVerticalSpacing);
-  }
   if (items_ & COOKIES) {
     layout->StartRow(0, double_column_view_set_id);
     layout->AddView(state_cookies_.get());