Revert 120803 - [uber] Redoing the homepage selection UI

chrome/browser/ui/webui/options2/browser_options_handler2.h

Index: chrome/browser/ui/webui/options2/browser_options_handler2.h
===================================================================
--- chrome/browser/ui/webui/options2/browser_options_handler2.h	(revision 120816)
+++ chrome/browser/ui/webui/options2/browser_options_handler2.h	(working copy)
@@ -10,6 +10,7 @@
 #include "base/memory/scoped_ptr.h"
 #include "base/memory/weak_ptr.h"
 #include "chrome/browser/autocomplete/autocomplete_controller_delegate.h"
+#include "chrome/browser/prefs/pref_change_registrar.h"
 #include "chrome/browser/prefs/pref_member.h"
 #include "chrome/browser/search_engines/template_url_service_observer.h"
 #include "chrome/browser/shell_integration.h"
@@ -102,6 +103,9 @@
   // Updates the UI with the given state for the default browser.
   void SetDefaultBrowserUIString(int status_string_id);
 
+  // Updates the label of the 'Show Home page'.
+  void UpdateHomePageLabel() const;
+
   // Loads the possible default search engine list and reports it to the WebUI.
   void UpdateSearchEngines();
 
@@ -140,6 +144,10 @@
   StringPrefMember homepage_;
   BooleanPrefMember default_browser_policy_;
 
+  // Used to observe updates to the preference of the list of URLs to load
+  // on startup, which can be updated via sync.
+  PrefChangeRegistrar pref_change_registrar_;
+
   TemplateURLService* template_url_service_;  // Weak.
 
   scoped_ptr<AutocompleteController> autocomplete_controller_;
Property changes on: chrome\browser\ui\webui\options2\browser_options_handler2.h
___________________________________________________________________
Deleted: svn:mergeinfo