uber managed pref banners

chrome/browser/resources/options2/options.html

Index: chrome/browser/resources/options2/options.html
diff --git a/chrome/browser/resources/options2/options.html b/chrome/browser/resources/options2/options.html
index a56f8c6aeb44dd99f97b31c0f2bce0033ab0db82..437983a39feebdcdc3e36de3582a94b6c789cc20 100644
--- a/chrome/browser/resources/options2/options.html
+++ b/chrome/browser/resources/options2/options.html
@@ -139,24 +139,36 @@
 
 <div id="main-content">
   <div id="mainview">
-     <div id="managed-prefs-banner" class="managed-prefs-banner" hidden>
-       <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">
-         <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>
-     </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>
 </div>
+
+<div id="templates" hidden>
+  <div id="managed-prefs-banner" class="managed-prefs-banner">
+    <div class="managed-prefs-gradient">
+      <span id="managed-prefs-text" class="managed-prefs-text"></span>
+    </div>
+  </div>
+</div>
+
 <script src="chrome://settings-frame/strings.js"></script>
 <script src="chrome://resources/js/i18n_template.js"></script>
 <script src="chrome://resources/js/i18n_process.js"></script>