Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(68)

Side by Side Diff: chrome/browser/resources/options2/content_settings.html

Issue 10332203: Merge 137434 - Disable the "Protected Content" section in the ChromeOS content settings dialog. (Closed) Base URL: svn://svn.chromium.org/chrome/branches/1132/src/
Patch Set: Created 8 years, 7 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch | Annotate | Revision Log
« no previous file with comments | « no previous file | no next file » | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 <div id="content-settings-page" class="page" hidden> 1 <div id="content-settings-page" class="page" hidden>
2 <div class="close-button"></div> 2 <div class="close-button"></div>
3 <h1 i18n-content="contentSettingsPage"></h1> 3 <h1 i18n-content="contentSettingsPage"></h1>
4 <div class="content-area"> 4 <div class="content-area">
5 <!-- Cookie filter tab contents --> 5 <!-- Cookie filter tab contents -->
6 <section> 6 <section>
7 <h3 i18n-content="cookies_tab_label"></h3> 7 <h3 i18n-content="cookies_tab_label"></h3>
8 <div> 8 <div>
9 <div class="radio"> 9 <div class="radio">
10 <label> 10 <label>
(...skipping 239 matching lines...) Expand 10 before | Expand all | Expand 10 after
250 <section> 250 <section>
251 <h3 i18n-content="webIntentsTabLabel" class="content-settings-header"> 251 <h3 i18n-content="webIntentsTabLabel" class="content-settings-header">
252 </h3> 252 </h3>
253 <div class="checkbox"> 253 <div class="checkbox">
254 <label> 254 <label>
255 <input pref="webintents.enabled" type="checkbox"> 255 <input pref="webintents.enabled" type="checkbox">
256 <span i18n-content="allowWebIntents"></span> 256 <span i18n-content="allowWebIntents"></span>
257 </label> 257 </label>
258 </div> 258 </div>
259 </section> 259 </section>
260 <if expr="pp_ifdef('chromeos')"> 260 <!-- TODO(markusheintz): Renable the Protected Content section once the 3rd
261 party dependencies of the backend are ready. -->
262 <if expr="pp_ifdef('chromeos') and False">
261 <!-- Protected Content filter --> 263 <!-- Protected Content filter -->
262 <section guest-visibility="disabled"> 264 <section guest-visibility="disabled">
263 <h3 i18n-content="protected_content_tab_label" 265 <h3 i18n-content="protected_content_tab_label"
264 class="content-settings-header"></h3> 266 class="content-settings-header"></h3>
265 <div> 267 <div>
266 <div class="settings-row"> 268 <div class="settings-row">
267 <span i18n-content="protected_content_info"></span> 269 <span i18n-content="protected_content_info"></span>
268 </div> 270 </div>
269 <div class="checkbox"> 271 <div class="checkbox">
270 <label> 272 <label>
271 <input pref="settings.privacy.drm_enabled" type="checkbox"> 273 <input pref="settings.privacy.drm_enabled" type="checkbox">
272 <span i18n-content="protected_content_enable"></span> 274 <span i18n-content="protected_content_enable"></span>
273 </label> 275 </label>
274 </div> 276 </div>
275 </div> 277 </div>
276 </section> 278 </section>
277 </if> 279 </if>
278 </div> 280 </div>
279 <div class="action-area"> 281 <div class="action-area">
280 <div class="button-strip"> 282 <div class="button-strip">
281 <button id="content-settings-overlay-confirm" i18n-content="ok"></button> 283 <button id="content-settings-overlay-confirm" i18n-content="ok"></button>
282 </div> 284 </div>
283 </div> 285 </div>
284 </div> 286 </div>
OLDNEW
« no previous file with comments | « no previous file | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698