Merge 24736 - Change default homepage experience....

chrome/browser/browser.cc

Index: chrome/browser/browser.cc
===================================================================
--- chrome/browser/browser.cc	(revision 24751)
+++ chrome/browser/browser.cc	(working copy)
@@ -25,6 +25,7 @@
 #include "chrome/browser/download/download_started_animation.h"
 #include "chrome/browser/find_bar.h"
 #include "chrome/browser/find_bar_controller.h"
+#include "chrome/browser/google_url_tracker.h"
 #include "chrome/browser/location_bar.h"
 #include "chrome/browser/metrics/user_metrics.h"
 #include "chrome/browser/net/url_fixer_upper.h"
@@ -1180,6 +1181,14 @@
 ///////////////////////////////////////////////////////////////////////////////
 
 // static
+void Browser::SetNewHomePagePrefs(PrefService* prefs) {
+  prefs->SetString(prefs::kHomePage,
+      ASCIIToWide(GoogleURLTracker::kDefaultGoogleHomepage));
+  prefs->SetBoolean(prefs::kHomePageIsNewTabPage, false);
+  prefs->SetBoolean(prefs::kShowHomeButton, true);
+}
+
+// static
 void Browser::RegisterPrefs(PrefService* prefs) {
   prefs->RegisterDictionaryPref(prefs::kBrowserWindowPlacement);
   prefs->RegisterIntegerPref(prefs::kOptionsWindowLastTabIndex, 0);
Property changes on: chrome\browser\browser.cc
___________________________________________________________________
Modified: svn:mergeinfo
   Merged /trunk/src/chrome/browser/browser.cc:r24736