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

chrome/browser/resources/options2/browser_options.js

 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 cr.define('options', function() {
   var OptionsPage = options.OptionsPage;
   var ArrayDataModel = cr.ui.ArrayDataModel;
   var RepeatingButton = cr.ui.RepeatingButton;
 
   //
@@ skipping 69 matching lines @@
       // Appearance section.
       $('change-home-page').onclick = function(event) {
         OptionsPage.navigateToPage('homePageOverlay');
       };
       $('themes-gallery').onclick = function(event) {
         window.open(localStrings.getString('themesGalleryURL'));
       };
       $('themes-reset').onclick = function(event) {
         chrome.send('themesReset');
       };
+      if (cr.isChromeOS) {
+        // // Appearance section.

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

nit, extra //

Perhaps we should combine the if blocks?

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

Done.

I like the idea that all code is grouped just the way page looks like - makes it
easier to find. 

+        if (AccountsOptions.loggedInAsGuest()) {
+          AccountsOptions.disableElementsForGuest(
+              $('toolbar-show-home-button-group'));
+          AccountsOptions.disableElementsForGuest(
+              $('bookmarkbar-show-on-all-tabs-group'));
+          // Search section
+          AccountsOptions.disableElementsForGuest($('instant-setting'));
+        }
+      }
 
       // Device section (ChromeOS only).
       if (cr.isChromeOS) {
         $('keyboard-settings-button').onclick = function(evt) {
           OptionsPage.navigateToPage('keyboard-overlay');
         };
         $('pointer-settings-button').onclick = function(evt) {
           OptionsPage.navigateToPage('pointer-overlay');
         };
         this.initBrightnessButton_('brightness-decrease-button',
@@ skipping 65 matching lines @@
         if (selectedProfile)
           ManageProfileOverlay.showManageDialog(selectedProfile);
       };
       $('profiles-delete').onclick = function(event) {
         var selectedProfile = self.getSelectedProfileItem_();
         if (selectedProfile)
           ManageProfileOverlay.showDeleteDialog(selectedProfile);
       };
 
       if (cr.isChromeOS) {
+        if (AccountsOptions.loggedInAsGuest()) {
+          // Disable the screen lock checkbox in guest mode.
+          AccountsOptions.disableElementsForGuest($('enable-screen-lock'));
+
+          // Hide the startup and users sections in Guest mode.
+          $('startup-section').hidden = true;
+          $('users-section').hidden = true;
+        }
+
         // Username (canonical email) of the currently logged in user or
         // |kGuestUser| if a guest session is active.
         this.username_ = localStrings.getString('username');
 
         $('account-picture-wrapper').onclick = function(event) {
           OptionsPage.navigateToPage('changePicture');
         };
         this.updateAccountPicture_();
 
-        if (cr.commandLine && cr.commandLine.options['--bwsi']) {
-          // Disable the screen lock checkbox and change-picture-button in
-          // guest mode.
-          $('enable-screen-lock').disabled = true;
-          $('change-picture-button').disabled = true;
-
-          // Hide the startup section in Guest mode.
-          $('startup-section').hidden = true;
-        }
-
         $('manage-accounts-button').onclick = function(event) {
           OptionsPage.navigateToPage('accounts');
           chrome.send('coreOptionsUserMetricsAction',
               ['Options_ManageAccounts']);
         };
       } else {
         $('import-data').onclick = function(event) {
           // Make sure that any previous import success message is hidden, and
           // we're showing the UI to import further data.
           $('import-data-configure').hidden = false;
@@ skipping 475 matching lines @@
     BrowserOptions.getLoggedInUsername = function() {
       return BrowserOptions.getInstance().username_;
     };
   }
 
   // Export
   return {
     BrowserOptions: BrowserOptions
   };
 });