Pepper Flash settings integration - camera and microphone.

chrome/browser/resources/options2/content_settings.js

Index: chrome/browser/resources/options2/content_settings.js
diff --git a/chrome/browser/resources/options2/content_settings.js b/chrome/browser/resources/options2/content_settings.js
index 41e32cdb0bd5124f80be8dffaa64a301de7b8d87..626cf76086ab2cb7e81dfd797c6ec9e5676e0d52 100644
--- a/chrome/browser/resources/options2/content_settings.js
+++ b/chrome/browser/resources/options2/content_settings.js
@@ -83,8 +83,6 @@ cr.define('options', function() {
         OptionsPage.navigateToPage('cookies');
       };
 
-      // Remove from DOM instead of hiding so :last-of-type applies the style
-      // correctly.
       var intentsSection = $('intents-section');
       if (!loadTimeData.getBoolean('enable_web_intents') && intentsSection)
         intentsSection.parentNode.removeChild(intentsSection);
@@ -96,6 +94,9 @@ cr.define('options', function() {
 
       $('content-settings-overlay-confirm').onclick =
           OptionsPage.closeOverlay.bind(OptionsPage);
+
+      $('pepper-flash-cameramic-section').style.display = 'none';
+      $('pepper-flash-cameramic-exceptions-div').style.display = 'none';

[csilv, 2012/06/05 00:40:21]

$('pepper-flash-cameramic-section').hidden = true;
$('pepper-flash-cameramic-exceptions-div').hidden = true;

[yzshen1, 2012/06/05 17:28:43]

I tried hidden before.
It worked with the section, but not the exceptions-dev.
But I didn't looked into why it didn't work.

Do you think I should make hidden work for the exceptions-div as well? (Would be
happy to do it if you think so.)
On 2012/06/05 00:40:21, csilv wrote:

[csilv, 2012/06/05 18:09:27]

That's okay, I'm fine with not using hidden for the reason you stated.  It would
be nice to figure out why it's not working, but not necessary for this CL.

     },
 
     /**
@@ -224,6 +225,16 @@ cr.define('options', function() {
     exceptionsList.patternValidityCheckComplete(pattern, valid);
   };
 
+  /**
+   * Enables the Pepper Flash camera and microphone settings.
+   * Please note that whether the settings are actually showed or not is also
+   * affected by the style class pepper-flash-settings.
+   */
+  ContentSettings.enablePepperFlashCameraMicSettings = function() {
+    $('pepper-flash-cameramic-section').style.display = '';
+    $('pepper-flash-cameramic-exceptions-div').style.display = '';

[csilv, 2012/06/05 00:40:21]

$('pepper-flash-cameramic-section').hidden = false;
$('pepper-flash-cameramic-exceptions-div').hidden = false;

[yzshen1, 2012/06/05 17:28:43]

Please see my comment above.

On 2012/06/05 00:40:21, csilv wrote:

+  }
+
   // Export
   return {
     ContentSettings: ContentSettings