Split the Media settings UI into separate microphone and camera sections.

chrome/browser/resources/options/content_settings.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.exportPath('options');
 
 /**
  * @typedef {{appId: string,
  *            appName: (string|undefined),
  *            embeddingOrigin: (string|undefined),
  *            origin: string,
  *            setting: string,
  *            source: string,
  *            video: (string|undefined)}}
  */
 options.Exception;
 
 cr.define('options', function() {
   /** @const */ var Page = cr.ui.pageManager.Page;
   /** @const */ var PageManager = cr.ui.pageManager.PageManager;
 
   // Lookup table to generate the i18n strings.
   /** @const */ var permissionsLookup = {
+    'cookies': 'cookies',
+    'images': 'images',
+    'javascript': 'javascript',
     'location': 'location',
+    'media-stream-camera': 'mediaStreamCamera',
+    'media-stream-mic': 'mediaStreamMic',
+    'multiple-automatic-downloads': 'multipleAutomaticDownloads',
     'notifications': 'notifications',
-    'media-stream': 'mediaStream',
-    'cookies': 'cookies',
-    'multiple-automatic-downloads': 'multipleAutomaticDownloads',
-    'images': 'images',
     'plugins': 'plugins',
     'popups': 'popups',
-    'javascript': 'javascript'
   };
 
   //////////////////////////////////////////////////////////////////////////////
   // ContentSettings class:
 
   /**
    * Encapsulated handling of content settings page.
    * @constructor
    * @extends {cr.ui.pageManager.Page}
    */
@@ skipping 100 matching lines @@
         value: dict[group].value,
         controlledBy: controlledBy,
       };
       for (var i = 0; i < indicators.length; i++) {
         indicators[i].handlePrefChange(event);
       }
     }
   };
 
   /**
-   * Updates the labels and indicators for the Media settings. Those require
-   * special handling because they are backed by multiple prefs and can change
-   * their scope based on the managed state of the backing prefs.
-   * @param {{askText: string, blockText: string, cameraDisabled: boolean,
-   *          micDisabled: boolean, showBubble: boolean, bubbleText: string}}
-   *     mediaSettings A dictionary containing the following fields:
-   *     askText The label for the ask radio button.
-   *     blockText The label for the block radio button.
-   *     cameraDisabled Whether to disable the camera dropdown.
-   *     micDisabled Whether to disable the microphone dropdown.
-   *     showBubble Wether to show the managed icon and bubble for the media
-   *                label.
-   *     bubbleText The text to use inside the bubble if it is shown.
-   */
-  ContentSettings.updateMediaUI = function(mediaSettings) {
-    $('media-stream-ask-label').innerHTML =
-        loadTimeData.getString(mediaSettings.askText);
-    $('media-stream-block-label').innerHTML =
-        loadTimeData.getString(mediaSettings.blockText);
-
-    if (mediaSettings.micDisabled)
-      $('media-select-mic').disabled = true;
-    if (mediaSettings.cameraDisabled)
-      $('media-select-camera').disabled = true;
-
-    PageManager.hideBubble();
-    // Create a synthetic pref change event decorated as
-    // CoreOptionsHandler::CreateValueForPref() does.
-    // TODO(arv): It was not clear what event type this should use?
-    var event = new Event('undefined');
-    event.value = {};
-
-    if (mediaSettings.showBubble) {
-      event.value = { controlledBy: 'policy' };
-      $('media-indicator').setAttribute(
-          'textpolicy', loadTimeData.getString(mediaSettings.bubbleText));
-      $('media-indicator').location = cr.ui.ArrowLocation.TOP_START;
-    }
-
-    $('media-indicator').handlePrefChange(event);
-  };
-
-  /**
    * Initializes an exceptions list.
    * @param {string} type The content type that we are setting exceptions for.
    * @param {Array<options.Exception>} exceptions An array of pairs, where the
    *     first element of each pair is the filter string, and the second is the
    *     setting (allow/block).
    */
   ContentSettings.setExceptions = function(type, exceptions) {
     this.getExceptionsList(type, 'normal').setExceptions(exceptions);
   };
 
@@ skipping 123 matching lines @@
     var deviceSelect = $('media-select-camera');
     chrome.send('setDefaultCaptureDevice', ['camera', deviceSelect.value]);
   };
 
   // Export
   return {
     ContentSettings: ContentSettings
   };
 
 });