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

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

Issue 10536103: Revert 141482 - Pepper Flash settings integration - camera and microphone. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src/
Patch Set: Created 8 years, 6 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
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 <!-- Pepper Flash camera and microphone filter -->
261 <section id="pepper-flash-cameramic-section" class="pepper-flash-settings">
262 <h3 i18n-content="pepperFlashCameramicTabLabel"></h3>
263 <div>
264 <div class="radio">
265 <label>
266 <input type="radio" name="pepper-flash-cameramic" value="ask">
267 <span i18n-content="pepperFlashCameramicAsk"></span>
268 </label>
269 </div>
270 <div class="radio">
271 <label>
272 <input type="radio" name="pepper-flash-cameramic" value="block">
273 <span i18n-content="pepperFlashCameramicBlock"></span>
274 </label>
275 </div>
276 <button class="exceptions-list-button"
277 contentType="pepper-flash-cameramic"
278 i18n-content="manage_exceptions"></button>
279 </div>
280 </section>
281 <if expr="pp_ifdef('chromeos')"> 260 <if expr="pp_ifdef('chromeos')">
282 <!-- Protected Content filter --> 261 <!-- Protected Content filter -->
283 <section guest-visibility="disabled"> 262 <section guest-visibility="disabled">
284 <h3 i18n-content="protectedContentTabLabel" 263 <h3 i18n-content="protectedContentTabLabel"
285 class="content-settings-header"></h3> 264 class="content-settings-header"></h3>
286 <div> 265 <div>
287 <div class="settings-row"> 266 <div class="settings-row">
288 <span i18n-content="protectedContentInfo"></span> 267 <span i18n-content="protectedContentInfo"></span>
289 </div> 268 </div>
290 <div class="checkbox"> 269 <div class="checkbox">
291 <label> 270 <label>
292 <input pref="settings.privacy.drm_enabled" type="checkbox"> 271 <input pref="settings.privacy.drm_enabled" type="checkbox">
293 <span i18n-content="protectedContentEnable"></span> 272 <span i18n-content="protectedContentEnable"></span>
294 </label> 273 </label>
295 </div> 274 </div>
296 </div> 275 </div>
297 </section> 276 </section>
298 </if> 277 </if>
299 </div> 278 </div>
300 <div class="action-area"> 279 <div class="action-area">
301 <div class="button-strip"> 280 <div class="button-strip">
302 <button id="content-settings-overlay-confirm" i18n-content="ok"></button> 281 <button id="content-settings-overlay-confirm" i18n-content="ok"></button>
303 </div> 282 </div>
304 </div> 283 </div>
305 </div> 284 </div>
OLDNEW
« no previous file with comments | « chrome/browser/pepper_flash_settings_manager.cc ('k') | chrome/browser/resources/options2/content_settings.js » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698