Settings: Bring Appearance section in line with mocks.

chrome/browser/resources/options2/browser_options.html

 <div id="browserPage" class="page" hidden>
   <h1 i18n-content="browserPage"></h1>
   <section id="sync-section">
     <h3 i18n-content="syncSection"></h3>
     <div id="sync-overview" class="section-description" hidden>
       <p i18n-content="syncOverview"></p>
       <a i18n-values="href:syncLearnMoreURL" i18n-content="learnMore"></a>
     </div>
     <div id="sync-status" hidden>
       <span id="sync-status-text"></span>
@@ skipping 41 matching lines @@
                 i18n-content="startupShowPages"></span>
             <button id="startupSetPages" class="link-button"
                 i18n-content="startupSetPages"></button>
           </span>
         </label>
       </div>
     </div>
   </section>
   <section>
     <h3 i18n-content="appearance"></h3>
+<if expr="not pp_ifdef('toolkit_views') and is_posix and not is_macosx">
+    <div>
+      <div>
+        <button id="themes-gallery" i18n-content="themesGallery"></button>
+        <button id="themes-GTK-button"
+            i18n-content="themesGTKButton"></button>
+        <button id="themes-reset"
+            i18n-content="themesSetClassic"></button>
+      </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>
     <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"></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>
+<if expr="not pp_ifdef('toolkit_views') and is_posix and not is_macosx">
+      <div class="checkbox">
+        <label>
+          <input id="show-window-decorations" type="checkbox"
+              pref="browser.custom_chrome_frame" metric="Options_CustomFrame"
+              inverted_pref>
+          <span i18n-content="showWindowDecorations"></span>
+        </label>
+      </div>
+</if>
     </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>
-</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>
@@ skipping 61 matching lines @@
 </if>
   <section>
     <h3 i18n-content="advancedGroupName"></h3>
     <div>
       <div i18n-content="advancedGroupDescription"></div>
       <button id="advancedOptionsButton"
           i18n-content="advancedOptionsButtonTitle"></button>
     </div>
   </section>
 </div>