[uber page] Merge advanced options page into browser options.

chrome/browser/resources/options2/options.html

Index: chrome/browser/resources/options2/options.html
===================================================================
--- chrome/browser/resources/options2/options.html	(revision 124465)
+++ chrome/browser/resources/options2/options.html	(working copy)
@@ -13,7 +13,6 @@
 <link rel="stylesheet" href="../shared/css/chrome_shared2.css">
 <link rel="stylesheet" href="../uber/uber_shared.css">
 <link rel="stylesheet" href="options_page.css">
-<link rel="stylesheet" href="advanced_options.css">
 <link rel="stylesheet" href="alert_overlay.css">
 <link rel="stylesheet" href="autofill_options.css">
 <link rel="stylesheet" href="autofill_overlay.css">
@@ -144,21 +143,16 @@
        <span id="managed-prefs-icon" class="managed-prefs-icon"></span>
        <span id="managed-prefs-text" class="managed-prefs-text"></span>
      </div>
+     <!-- TODO(csilv): Remove subpage-backdrop -->
      <div id="subpage-backdrop" hidden></div>
      <div id="mainview-content">
        <div id="page-container">
-         <!-- Please keep the main pages in desired order of display.  This will
-              allow search results to display in the desired order. -->
          <include src="search_page.html">
          <include src="browser_options.html">
        </div>
+       <!-- TODO(csilv): Remove subpage-sheet-container-1 -->
        <div id="subpage-sheet-container-1"
            class="subpage-sheet-container transparent" hidden>
-         <div id="subpage-sheet-1" class="subpage-sheet">
-           <div class="subpage-sheet-contents">
-             <include src="advanced_options.html">
-           </div>
-         </div>
        </div>
      </div>
   </div>