Options2: Pull the trigger.

chrome/browser/resources/options2/browser_options.html

Index: chrome/browser/resources/options2/browser_options.html
diff --git a/chrome/browser/resources/options2/browser_options.html b/chrome/browser/resources/options2/browser_options.html
new file mode 100644
index 0000000000000000000000000000000000000000..2af7b17b8ddb68c851dd3fd10d6dfbfef8ca7cd4
--- /dev/null
+++ b/chrome/browser/resources/options2/browser_options.html
@@ -0,0 +1,128 @@
+<div id="browserPage" class="page" hidden>
+  <h1 i18n-content="browserPage"></h1>
+  <div class="displaytable">
+    <section id="startupSection">
+      <h3 i18n-content="startupGroupName"></h3>
+      <div>
+        <div class="radio">
+          <label>
+            <input type="radio" name="startup" value="0"
+                pref="session.restore_on_startup"
+                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>
+        </div>
+        <div class="radio">
+          <label>
+            <input id="startupShowPagesButton" type="radio" name="startup"
+                pref="session.restore_on_startup"
+                value="4" metric="Options_Startup_Custom">
+            <span id="startupShowPagesLabel"
+                i18n-content="startupShowPages"></span>
+          </label>
+        </div>
+        <div class="suboption">
+          <div id="startupPageManagement" class="settings-list">
+            <list id="startupPagesList"></list>
+            <div>
+              <button id="startupUseCurrentButton"
+                  i18n-content="startupUseCurrent"></button>
+            </div>
+          </div>
+          <div id="startupPagesListDropmarker"></div>
+        </div>
+      </div>
+    </section>
+    <section>
+      <h3 i18n-content="homepageGroupName"></h3>
+      <div>
+        <div class="radio">
+          <label>
+            <input id="homepageUseNTPButton" type="radio" name="homepage"
+                value="true" metric="Options_Homepage_IsNewTabPage"
+                pref="homepage_is_newtabpage">
+            <span i18n-content="homepageUseNewTab"></span>
+          </label>
+        </div>
+        <div id="customHomePageGroup">
+          <div class="radio">
+            <label>
+              <input id="homepageUseURLButton" type="radio" name="homepage"
+                  value="false" metric="Options_Homepage_IsNewTabPage"
+                  pref="homepage_is_newtabpage">
+              <span i18n-content="homepageUseURL"></span>
+            </label>
+          </div>
+          <div>
+            <input id="homepageURL" class="weakrtl favicon-cell" type="url"
+                data-type="url" pref="homepage">
+          </div>
+        </div>
+      </div>
+    </section>
+    <section>
+      <h3 i18n-content="toolbarGroupName"></h3>
+      <div>
+        <div class="checkbox">
+          <label>
+            <input id="toolbarShowHomeButton" pref="browser.show_home_button"
+                metric="Options_Homepage_HomeButton" type="checkbox">
+            <span i18n-content="toolbarShowHomeButton"></span>
+          </label>
+        </div>
+        <div class="checkbox">
+          <label>
+            <input id="toolbarShowBookmarksBar"
+                pref="bookmark_bar.show_on_all_tabs"
+                metric="Options_ShowBookmarksBar" type="checkbox">
+            <span i18n-content="toolbarShowBookmarksBar"></span>
+          </label>
+        </div>
+      </div>
+    </section>
+    <section>
+      <h3 i18n-content="defaultSearchGroupName"></h3>
+        <div id="defaultSearchEngineGroup">
+          <div>
+            <select id="defaultSearchEngine" class="weakrtl"></select>
+            <button id="defaultSearchManageEnginesButton"
+                i18n-content="defaultSearchManageEngines"></button>
+          </div>
+          <div id="instantOption" class="checkbox">
+            <label id="instantLabel">
+              <!-- TODO(estade): metric? -->
+              <input id="instantFieldTrialCheckbox" type="checkbox"
+                  checked="checked" hidden>
+              <input id="instantEnabledCheckbox" type="checkbox"
+                  pref="instant.enabled">
+              <span i18n-content="instantName"></span>
+            </label>
+          </div>
+          <div class="suboption informational-text">
+            <span i18n-content="instantWarningText"></span>
+            <a target="_blank" i18n-values="href:instantLearnMoreLink"
+               i18n-content="learnMore"></a>
+          </div>
+        </div>
+    </section>
+<if expr="not pp_ifdef('chromeos')">
+    <section>
+      <h3 i18n-content="defaultBrowserGroupName"></h3>
+      <div>
+        <button id="defaultBrowserUseAsDefaultButton"
+            i18n-content="defaultBrowserUseAsDefault"></button>
+        <div id="defaultBrowserState"
+            i18n-content="defaultBrowserUnknown"></div>
+      </div>
+    </section>
+</if>
+  </div>
+</div>