Merge 24736 - Change default homepage experience....

chrome/browser/browser_main.cc

Index: chrome/browser/browser_main.cc
===================================================================
--- chrome/browser/browser_main.cc	(revision 24751)
+++ chrome/browser/browser_main.cc	(working copy)
@@ -601,11 +601,14 @@
   // Note that this be done _after_ the PrefService is initialized and all
   // preferences are registered, since some of the code that the importer
   // touches reads preferences.
-  if (is_first_run && !first_run_ui_bypass) {
-    if (!OpenFirstRunDialog(profile, &process_singleton)) {
-      // The user cancelled the first run dialog box, we should exit Chrome.
-      return ResultCodes::NORMAL_EXIT;
+  if (is_first_run) {
+    if (!first_run_ui_bypass) {
+      if (!OpenFirstRunDialog(profile, &process_singleton)) {
+        // The user cancelled the first run dialog box, we should exit Chrome.
+        return ResultCodes::NORMAL_EXIT;
+      }
     }
+    Browser::SetNewHomePagePrefs(user_prefs);
   }
 
   // Sets things up so that if we crash from this point on, a dialog will
Property changes on: chrome\browser\browser_main.cc
___________________________________________________________________
Modified: svn:mergeinfo
   Merged /trunk/src/chrome/browser/browser_main.cc:r24736