Pepper Flash settings integration - camera and microphone.

chrome/browser/resources/options2/content_settings.html

Index: chrome/browser/resources/options2/content_settings.html
diff --git a/chrome/browser/resources/options2/content_settings.html b/chrome/browser/resources/options2/content_settings.html
index 0e987d7b0412ac15d562fb5ef2ff2cc1eebacfd5..b42b1db01ca44968596db69c5c8c73e58daf331e 100644
--- a/chrome/browser/resources/options2/content_settings.html
+++ b/chrome/browser/resources/options2/content_settings.html
@@ -255,6 +255,27 @@
         </label>
       </div>
     </section>
+    <!-- Pepper Flash camera and microphone filter -->
+    <section id="pepper-flash-cameramic-section" class="pepper-flash-settings">
+      <h3 i18n-content="pepper_flash_cameramic_tab_label"></h3>

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

nit: Per style guide, use javaScriptCase for i18n-content.

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

[ I actually noticed the name inconsistency. But after some consideration, I
chose the current approach. Here are the reasons. :( ]

It seems there are far more names_like_this for i18n-content in this file
Is that something that we would like to change in the future?

Besides, some js code actually expects name_like_this: showList in
content_settings_exceptions_area.js appends '_header' to a type name and make it
the text content.

So unless we change the js code, we will have to name at least the header as
<something>_header. In order to make it consistent, I decided to name the
content type as pepper_flash_cameramic (so that the header will be named
pepper_flash_cameramic_header).

This also explain why I named the input on line 264 using underscore. Because it
is the content type.
 
On 2012/06/05 00:40:21, csilv wrote:

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

Your reasons are valid, but we shouldn't make the problem worse by adding to the
inconsistency.  While this file has underscore naming, most web-ui files do not.
 (For example, see BrowserOptionsHandler::GetLocalizedValues() in
browser_options_handler2.cc).  You don't need to change existing lines, but
let's follow the style guide for new lines (and hopefully someone will fix the
incorrect ones later.
(http://www.chromium.org/developers/web-development-style-guide) And yes, the
code that appends "_header" should ideally be fixed (but not for this CL).

[yzshen1, 2012/06/05 19:57:57]

Done.

+      <div>
+        <div class="radio">
+          <label>
+            <input type="radio" name="pepper_flash_cameramic" value="ask">

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

nit: probably better to use dash instead of underscore for the name attributes,
more consistent with other attributes (id, class).  Not required.

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

Please see my comment above.

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

+            <span i18n-content="pepper_flash_cameramic_ask"></span>
+          </label>
+        </div>
+        <div class="radio">
+          <label>
+            <input type="radio" name="pepper_flash_cameramic" value="block">
+            <span i18n-content="pepper_flash_cameramic_block"></span>
+          </label>
+        </div>
+        <button class="exceptions-list-button"
+            contentType="pepper_flash_cameramic"
+            i18n-content="manage_exceptions"></button>
+      </div>
+    </section>
 <if expr="pp_ifdef('chromeos')">
     <!-- Protected Content filter -->
     <section guest-visibility="disabled">