r137468 - branches/1132/src/chrome/browser/resources/options2

[markus...@chromium.org]

Author: markus...@chromium.org
Date: Wed May 16 11:51:15 2012
New Revision: 137468

Log:
Merge 137434 - Disable the "Protected Content" section in the ChromeOS content settings dialog.

BUG=128337
TEST=The "Protected Content" section is not visible in the content settings dialog (ChromeOS only)

Review URL: https://chromiumcodereview.appspot.com/10383211

TBR=markus...@chromium.org
Review URL: https://chromiumcodereview.appspot.com/10332203

Modified:
branches/1132/src/chrome/browser/resources/options2/content_settings.html

Modified: branches/1132/src/chrome/browser/resources/options2/content_settings.html
==============================================================================
--- branches/1132/src/chrome/browser/resources/options2/content_settings.html (original)
+++ branches/1132/src/chrome/browser/resources/options2/content_settings.html Wed May 16 11:51:15 2012
@@ -257,7 +257,9 @@
</label>
</div>
</section>
-<if expr="pp_ifdef('chromeos')">
+<!-- TODO(markusheintz): Renable the Protected Content section once the 3rd
+ party dependencies of the backend are ready. -->
+<if expr="pp_ifdef('chromeos') and False">
<!-- Protected Content filter -->
<section guest-visibility="disabled">
<h3 i18n-content="protected_content_tab_label"