Merge r18210....

chrome/browser/first_run.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 <atlbase.h>
 #include <atlcom.h>
 #include <windows.h>
 #include <shellapi.h>
 #include <shlobj.h>
 
@@ skipping 292 matching lines @@
   if (parse_result & installer_util::MASTER_PROFILE_SHOW_WELCOME)
     FirstRun::SetShowWelcomePagePref();
 
   int import_items = 0;
   if (parse_result & installer_util::MASTER_PROFILE_IMPORT_SEARCH_ENGINE)
     import_items += SEARCH_ENGINES;
   if (parse_result & installer_util::MASTER_PROFILE_IMPORT_HISTORY)
     import_items += HISTORY;
   if (parse_result & installer_util::MASTER_PROFILE_IMPORT_BOOKMARKS)
     import_items += FAVORITES;
+  if (parse_result & installer_util::MASTER_PROFILE_IMPORT_HOME_PAGE)
+    import_items += HOME_PAGE;
 
   if (import_items) {
     // There is something to import from the default browser. This launches
     // the importer process and blocks until done or until it fails.
     if (!FirstRun::ImportSettings(NULL, 0, import_items, NULL)) {
       LOG(WARNING) << "silent import failed";
     }
   }
 
   if (parse_result &
@@ skipping 568 matching lines @@
 
   DISALLOW_COPY_AND_ASSIGN(TryChromeDialog);
 };
 
 }  // namespace
 
 Upgrade::TryResult Upgrade::ShowTryChromeDialog() {
   TryChromeDialog td;
   return td.ShowModal();
 }