Revert 120803 - [uber] Redoing the homepage selection UI

chrome/browser/resources/options2/browser_options.html

 <div id="settings" class="page" hidden>
   <header>
     <h1 i18n-content="settingsTitle"></h1>
     <span id="browser-options-search-field-container"
         class="search-field-container">
       <input id="search-field" type="search"
           i18n-values="placeholder:searchPlaceholder;
                        aria-label:searchPlaceholder" incremental>
     </span>
   </header>
@@ skipping 34 matching lines @@
     </div>
   </section>
 </if>
 <if expr="not pp_ifdef('chromeos')">
   <!-- This section is temporarily duplicated down below for ChromeOS. -->
   <section id="startup-section">
     <h3 i18n-content="sectionTitleStartup"></h3>
     <div>
       <div class="radio">
         <label>
-          <input type="radio" name="startup" value="5"
+          <input type="radio" name="startup" value="0"
               pref="session.restore_on_startup"
-              metric="Options_Startup_NewTab">
+              metric="Options_Startup_Homepage">
           <span i18n-content="startupShowDefaultAndNewTab"></span>
         </label>
       </div>
       <div class="radio">
         <label>
           <input type="radio" name="startup" value="1"
               pref="session.restore_on_startup"
               metric="Options_Startup_LastSession">
           <span id="old-startup-last-text"
               i18n-content="startupShowLastSession">
@@ skipping 28 matching lines @@
           i18n-content="themesSetClassic"></button>
     </div>
 </if>
 <if expr="pp_ifdef('toolkit_views') or os == 'win32' or os == 'darwin'">
     <div>
       <button id="themes-gallery" i18n-content="themesGallery"></button>
       <button id="themes-reset" i18n-content="themesReset"></button>
     </div>
 </if>
     <div>
-      <div id="home-page-select-container">
-        <label id="home-page-label" for="home-page-select"
-            i18n-content="homePage"></label>
-        <select id="home-page-select">
-          <option value="none" i18n-content="homePageNone"></option>
-          <option value="ntp" i18n-content="homePageNtp"></option>
-          <option value="url"></option>
-          <option value="choose" i18n-content="homePageChoose"></option>
-        </select>
+      <div class="checkbox">
+        <input id="toolbar-show-home-button" pref="browser.show_home_button"
+            metric="Options_Homepage_HomeButton" type="checkbox">
+        <label id="home-page-label" for="toolbar-show-home-button"
+            i18n-content="toolbarShowHomeButton">
+        </label>
+        <button id="change-home-page" i18n-content="changeHomePage"
+            class="link-button">
+        </button>
       </div>
       <div class="checkbox">
         <label>
           <input type="checkbox" pref="bookmark_bar.show_on_all_tabs"
               metric="Options_ShowBookmarksBar">
           <span i18n-content="toolbarShowBookmarksBar"></span>
         </label>
       </div>
 <if expr="not pp_ifdef('toolkit_views') and is_posix and not is_macosx">
       <div class="checkbox">
@@ skipping 141 matching lines @@
 </if>
 <if expr="pp_ifdef('chromeos')">
   <!-- This section is temporarily duplicated here for ChromeOS. -->
   <!-- TODO(csilv): Move to 'Under the Hood' for ChromeOS only. -->
   <!-- http://crbug.com/110527 -->
   <section id="startup-section">
     <h3 i18n-content="sectionTitleStartup"></h3>
     <div>
       <div class="radio">
         <label>
-          <input type="radio" name="startup" value="5"
+          <input type="radio" name="startup" value="0"
               pref="session.restore_on_startup"
-              metric="Options_Startup_NewTab">
+              metric="Options_Startup_Homepage">
           <span i18n-content="startupShowDefaultAndNewTab"></span>
         </label>
       </div>
       <div class="radio">
         <label>
           <input type="radio" name="startup" value="1"
               pref="session.restore_on_startup"
               metric="Options_Startup_LastSession">
           <span i18n-content="startupShowLastSession"></span>
         </label>
@@ skipping 18 matching lines @@
 </if>
   <section>
     <h3 i18n-content="sectionTitleAdvanced"></h3>
     <div>
       <button id="advanced-settings"
           i18n-content="advancedSettings">
       </button>
     </div>
   </section>
 </div>