[uber page] Convert 'Under the Hood' page to a sub-page.

chrome/browser/resources/options2/options.html

Index: chrome/browser/resources/options2/options.html
===================================================================
--- chrome/browser/resources/options2/options.html	(revision 116378)
+++ chrome/browser/resources/options2/options.html	(working copy)
@@ -121,16 +121,23 @@
            <include src="chromeos/internet_options.html">
            <include src="chromeos/accounts_options.html">
          </if>
-         <include src="advanced_options.html">
        </div>
        <div id="subpage-sheet-container-1"
            class="subpage-sheet-container transparent" hidden>
          <div id="subpage-sheet-1" class="subpage-sheet">
            <button class="raw-button close-subpage custom-appearance"></button>
            <div class="subpage-sheet-contents">
+             <include src="search_engine_manager.html">
+             <include src="advanced_options.html">
+           </div>
+         </div>
+       </div>
+       <div id="subpage-sheet-container-2"
+           class="subpage-sheet-container transparent" hidden>
+         <div id="subpage-sheet-2" class="subpage-sheet">
+           <button class="raw-button close-subpage custom-appearance"></button>
+           <div class="subpage-sheet-contents">
              <if expr="pp_ifdef('chromeos')">
-               <include src="about_page.html">

[James Hawkins, 2012/01/04 23:34:30]

Where do these go now?

[csilv, 2012/01/04 23:48:23]

These pages are not accessible in options2, so I'll revert the change for
simplicity.  'About' is a top-level page so it has to come out of settings and
be moved into a new page.  (I'll file a bug).

I don't know about the picture since it's not included Glen's specs.  I'll ask
for clarification.

[James Hawkins, 2012/01/04 23:54:35]

Thanks!

-               <include src="chromeos/change_picture_options.html">
                <include src="chromeos/proxy.html">
              </if>
              <if expr="not pp_ifdef('win32') and not pp_ifdef('darwin')">
@@ -141,13 +148,12 @@
              <include src="font_settings.html">
              <include src="language_options.html">
              <include src="password_manager.html">
-             <include src="search_engine_manager.html">
            </div>
          </div>
        </div>
-       <div id="subpage-sheet-container-2"
+       <div id="subpage-sheet-container-3"
            class="subpage-sheet-container transparent" hidden>
-         <div id="subpage-sheet-2" class="subpage-sheet">
+         <div id="subpage-sheet-3" class="subpage-sheet">
            <button class="raw-button close-subpage custom-appearance"></button>
            <div class="subpage-sheet-contents">
              <if expr="pp_ifdef('chromeos')">