Merge 24736 - Change default homepage experience....

chrome/browser/browser_main.cc

 // Copyright (c) 2006-2009 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 "build/build_config.h"
 
 #include <algorithm>
 
 #include "app/l10n_util.h"
 #include "app/resource_bundle.h"
@@ skipping 583 matching lines @@
   if (CheckMachineLevelInstall())
     return ResultCodes::MACHINE_LEVEL_INSTALL_EXISTS;
 
   process_singleton.Create();
 
   // Show the First Run UI if this is the first time Chrome has been run on
   // this computer, or we're being compelled to do so by a command line flag.
   // 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
   // popup asking the user to restart chrome. It is done this late to avoid
   // testing against a bunch of special cases that are taken care early on.
   PrepareRestartOnCrashEnviroment(parsed_command_line);
 
 #if defined(OS_WIN)
   // Initialize Winsock.
   net::EnsureWinsockInit();
@@ skipping 154 matching lines @@
   if (metrics)
     metrics->Stop();
 
   // browser_shutdown takes care of deleting browser_process, so we need to
   // release it.
   browser_process.release();
   browser_shutdown::Shutdown();
 
   return result_code;
 }