Hide/Disable several (meaningless) options in Settings uber-page for Guest.

chrome/browser/resources/options2/browser_options.html

 <div id="settings" class="page" hidden>
   <header>
     <h1 i18n-content="settingsTitle"></h1>
     <span id="browser-options-search-field-container"
         class="search-field-container">
       <input id="search-field" type="search"
           i18n-values="placeholder:searchPlaceholder;
                        aria-label:searchPlaceholder" incremental>
     </span>
   </header>
@@ skipping 85 matching lines @@
           i18n-content="themesSetClassic"></button>
     </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">
+      <div id="toolbar-show-home-button-group" class="checkbox">
         <label>
-          <input id="toolbar-show-home-button" pref="browser.show_home_button"
-              metric="Options_Homepage_HomeButton" type="checkbox">
-          <span id="home-page-label"
-              i18n-content="toolbarShowHomeButton"></span>
+        <input id="toolbar-show-home-button" pref="browser.show_home_button"
+            metric="Options_Homepage_HomeButton" type="checkbox">
+        <span id="home-page-label" for="toolbar-show-home-button"
+            i18n-content="toolbarShowHomeButton"></span>

[csilv, 2012/03/01 01:32:18]

please restore the indentation that was removed.  the 'for' tag isn't needed
because of the nesting, it seems like you were going to to make a change that
you decided against.

[Denis Kuznetsov (DE-MUC), 2012/03/01 14:21:54]

Done.

         </label>
         <button id="change-home-page" i18n-content="changeHomePage"
             class="link-button"></button>
       </div>
-      <div class="checkbox"><label>
+      <div id="bookmarkbar-show-on-all-tabs-group" class="checkbox">
+        <label>
           <input type="checkbox" pref="bookmark_bar.show_on_all_tabs"
               metric="Options_ShowBookmarksBar">
           <span i18n-content="toolbarShowBookmarksBar"></span>
-      </label></div>
+        </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>
   </section>
@@ skipping 53 matching lines @@
                 checked="checked" hidden>
             <input id="instant-enabled-control" type="checkbox"
                 pref="instant.enabled">
             <!-- TODO(estade) There's a link in here which should not be inside
                  a <label>. -->
             <span i18n-values=".innerHTML:instantPrefAndWarning"></span>
           </label>
         </div>
       </div>
   </section>
-  <section>
+  <section id="users-section">
     <h3 i18n-content="sectionTitleUsers"></h3>
 <if expr="pp_ifdef('chromeos')">
     <div id="sync-section">
       <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="account-picture-wrapper">
         <img id="account-picture"
             src="chrome://theme/IDR_PROFILE_PICTURE_LOADING">
@@ skipping 111 matching lines @@
 </if>
   <section>
     <h3 i18n-content="sectionTitleAdvanced"></h3>
     <div>
       <button id="advanced-settings"
           i18n-content="advancedSettings">
       </button>
     </div>
   </section>
 </div>