[uber page] Migrate remaining Personal options into Browser options.

chrome/browser/resources/options2/browser_options.html

 <div id="browserPage" class="page" hidden>
   <h1 i18n-content="settingsTitle"></h1>
   <section id="sync-section">
     <h3 i18n-content="syncSection"></h3>
     <div id="sync-overview" class="section-description" hidden>
       <span i18n-content="syncOverview"></span>
       <a i18n-values="href:syncLearnMoreURL" i18n-content="learnMore"></a>
     </div>
     <div id="sync-status" hidden>
       <span id="sync-status-text"></span>
@@ skipping 40 matching lines @@
             <span id="startupShowPagesLabel"
                 i18n-content="startupShowPages"></span>
             <button id="startupSetPages" class="link-button"
                 i18n-content="startupSetPages"></button>
           </span>
         </label>
       </div>
     </div>
   </section>
   <section>
-    <h3 i18n-content="toolbarGroupName"></h3>
+    <h3 i18n-content="appearance"></h3>
     <div>
       <div class="checkbox">
         <input id="toolbarShowHomeButton" pref="browser.show_home_button"
             metric="Options_Homepage_HomeButton" type="checkbox">
         <label id="home-page-label" for="toolbarShowHomeButton"
             i18n-content="toolbarShowHomeButton">
         </label>
         <button id="change-home-page" i18n-content="changeHomePage"
             class="link-button custom-appearance"></button>
       </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>
+<if expr="not pp_ifdef('toolkit_views') and is_posix and not is_macosx">
+    <div>
+      <div>
+        <button id="themes-GTK-button"
+            i18n-content="themesGTKButton"></button>
+        <button id="themes-reset"
+            i18n-content="themesSetClassic"></button>
+      </div>
+      <div id="themes-gallery-div">
+        <a id="themes-gallery" i18n-content="themesGallery"
+            i18n-values="href:themesGalleryURL" target="_blank"></a>
+      </div>
+      <div class="radio">
+        <label>
+          <input name="decorations_radio" pref="browser.custom_chrome_frame"
+              type="radio" value="false" metric="Options_CustomFrame">
+          <span i18n-content="showWindowDecorations"></span>
+        </label>
+      </div>
+      <div class="radio">
+        <label>
+          <input name="decorations_radio" pref="browser.custom_chrome_frame"
+              type="radio" value="true" metric="Options_CustomFrame">
+          <span i18n-content="hideWindowDecorations"></span>
+        </label>
+      </div>
+    </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>
   </section>
   <section>
     <h3 i18n-content="defaultSearchGroupName"></h3>
       <div id="defaultSearchEngineGroup">
         <div id="defaultSearchGroupLabel"
              i18n-values=".innerHTML:defaultSearchGroupLabel"></div>
         <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-values=".innerHTML:instantPrefAndWarning"></span>
           </label>
         </div>
       </div>
   </section>
   <section id="profiles-section" hidden>
     <h3 i18n-content="profiles"></h3>
+<if expr="pp_ifdef('chromeos')">
+    <div>
+      <span id="account-picture-wrapper">
+        <img id="account-picture"
+            src="chrome://theme/IDR_PROFILE_PICTURE_LOADING">
+      </span>
+      <label>
+        <input id="enable-screen-lock" type="checkbox"
+            pref="settings.enable_screen_lock">
+        <span i18n-content="enableScreenlock"></span>
+      </label>
+      <br>
+      <button id="change-picture-button" i18n-content="changePicture"></button>
+    </div>
+</if>
     <div>
       <list id="profiles-list" class="settings-list" hidden></list>
       <div id="profiles-single-message" i18n-content="profilesSingleUser">
       </div>
       <div id="profiles-buttons">
         <button id="profiles-create" i18n-content="profilesCreate"></button>
         <button id="profiles-manage" i18n-content="profilesManage" disabled>
         </button>
         <button id="profiles-delete" i18n-content="profilesDelete">
         </button>
       </div>
     </div>
+<if expr="not pp_ifdef('chromeos')">
+    <div id="manage-data-group">
+      <div i18n-content="manageDataDescription"></div>
+      <div>
+        <button id="import-data" i18n-content="importData"></button>
+      </div>
+    </div>
+</if>
   </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>
   <section>
     <h3 i18n-content="advancedGroupName"></h3>
     <div>
       <div i18n-content="advancedGroupDescription"></div>
       <button id="advancedOptionsButton"
           i18n-content="advancedOptionsButtonTitle"></button>
     </div>
   </section>
 </div>