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

Side by Side Diff: chrome/browser/ui/prefs/prefs_tab_helper.cc

Issue 2676633006: media: Add a web preference to enable encrypted media (Closed)
Patch Set: use a new pref Created 3 years, 10 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
« no previous file with comments | « chrome/browser/media/encrypted_media_browsertest.cc ('k') | chrome/common/pref_names.h » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
2 // Use of this source code is governed by a BSD-style license that can be 2 // Use of this source code is governed by a BSD-style license that can be
3 // found in the LICENSE file. 3 // found in the LICENSE file.
4 4
5 #include "chrome/browser/ui/prefs/prefs_tab_helper.h" 5 #include "chrome/browser/ui/prefs/prefs_tab_helper.h"
6 6
7 #include <stddef.h> 7 #include <stddef.h>
8 #include <stdint.h> 8 #include <stdint.h>
9 9
10 #include <set> 10 #include <set>
(...skipping 73 matching lines...) Expand 10 before | Expand all | Expand 10 after
84 prefs::kWebKitFontScaleFactor, 84 prefs::kWebKitFontScaleFactor,
85 prefs::kWebKitForceEnableZoom, 85 prefs::kWebKitForceEnableZoom,
86 prefs::kWebKitPasswordEchoEnabled, 86 prefs::kWebKitPasswordEchoEnabled,
87 #endif 87 #endif
88 prefs::kWebKitJavascriptCanOpenWindowsAutomatically, 88 prefs::kWebKitJavascriptCanOpenWindowsAutomatically,
89 prefs::kWebKitJavascriptEnabled, 89 prefs::kWebKitJavascriptEnabled,
90 prefs::kWebKitLoadsImagesAutomatically, 90 prefs::kWebKitLoadsImagesAutomatically,
91 prefs::kWebKitMinimumFontSize, 91 prefs::kWebKitMinimumFontSize,
92 prefs::kWebKitMinimumLogicalFontSize, 92 prefs::kWebKitMinimumLogicalFontSize,
93 prefs::kWebKitPluginsEnabled, 93 prefs::kWebKitPluginsEnabled,
94 prefs::kWebKitEncryptedMediaEnabled,
94 prefs::kWebkitTabsToLinks, 95 prefs::kWebkitTabsToLinks,
95 prefs::kWebKitTextAreasAreResizable, 96 prefs::kWebKitTextAreasAreResizable,
96 prefs::kWebKitWebSecurityEnabled, 97 prefs::kWebKitWebSecurityEnabled,
97 }; 98 };
98 99
99 const int kPrefsToObserveLength = arraysize(kPrefsToObserve); 100 const int kPrefsToObserveLength = arraysize(kPrefsToObserve);
100 101
101 #if !defined(OS_ANDROID) 102 #if !defined(OS_ANDROID)
102 // Registers a preference under the path |pref_name| for each script used for 103 // Registers a preference under the path |pref_name| for each script used for
103 // per-script font prefs. 104 // per-script font prefs.
(...skipping 411 matching lines...) Expand 10 before | Expand all | Expand 10 after
515 registry->RegisterBooleanPref(prefs::kWebKitJavascriptEnabled, 516 registry->RegisterBooleanPref(prefs::kWebKitJavascriptEnabled,
516 pref_defaults.javascript_enabled); 517 pref_defaults.javascript_enabled);
517 registry->RegisterBooleanPref(prefs::kWebKitWebSecurityEnabled, 518 registry->RegisterBooleanPref(prefs::kWebKitWebSecurityEnabled,
518 pref_defaults.web_security_enabled); 519 pref_defaults.web_security_enabled);
519 registry->RegisterBooleanPref( 520 registry->RegisterBooleanPref(
520 prefs::kWebKitJavascriptCanOpenWindowsAutomatically, true); 521 prefs::kWebKitJavascriptCanOpenWindowsAutomatically, true);
521 registry->RegisterBooleanPref(prefs::kWebKitLoadsImagesAutomatically, 522 registry->RegisterBooleanPref(prefs::kWebKitLoadsImagesAutomatically,
522 pref_defaults.loads_images_automatically); 523 pref_defaults.loads_images_automatically);
523 registry->RegisterBooleanPref(prefs::kWebKitPluginsEnabled, 524 registry->RegisterBooleanPref(prefs::kWebKitPluginsEnabled,
524 pref_defaults.plugins_enabled); 525 pref_defaults.plugins_enabled);
526 registry->RegisterBooleanPref(prefs::kWebKitEncryptedMediaEnabled,
527 pref_defaults.encrypted_media_enabled);
525 registry->RegisterBooleanPref(prefs::kWebKitDomPasteEnabled, 528 registry->RegisterBooleanPref(prefs::kWebKitDomPasteEnabled,
526 pref_defaults.dom_paste_enabled); 529 pref_defaults.dom_paste_enabled);
527 registry->RegisterBooleanPref(prefs::kWebKitTextAreasAreResizable, 530 registry->RegisterBooleanPref(prefs::kWebKitTextAreasAreResizable,
528 pref_defaults.text_areas_are_resizable); 531 pref_defaults.text_areas_are_resizable);
529 registry->RegisterBooleanPref(prefs::kWebkitTabsToLinks, 532 registry->RegisterBooleanPref(prefs::kWebkitTabsToLinks,
530 pref_defaults.tabs_to_links); 533 pref_defaults.tabs_to_links);
531 registry->RegisterBooleanPref(prefs::kWebKitAllowRunningInsecureContent, 534 registry->RegisterBooleanPref(prefs::kWebKitAllowRunningInsecureContent,
532 false); 535 false);
533 registry->RegisterBooleanPref(prefs::kEnableReferrers, true); 536 registry->RegisterBooleanPref(prefs::kEnableReferrers, true);
534 #if defined(OS_ANDROID) 537 #if defined(OS_ANDROID)
(...skipping 139 matching lines...) Expand 10 before | Expand all | Expand 10 after
674 } 677 }
675 678
676 void PrefsTabHelper::NotifyWebkitPreferencesChanged( 679 void PrefsTabHelper::NotifyWebkitPreferencesChanged(
677 const std::string& pref_name) { 680 const std::string& pref_name) {
678 #if !defined(OS_ANDROID) 681 #if !defined(OS_ANDROID)
679 OnFontFamilyPrefChanged(pref_name); 682 OnFontFamilyPrefChanged(pref_name);
680 #endif 683 #endif
681 684
682 web_contents_->GetRenderViewHost()->OnWebkitPreferencesChanged(); 685 web_contents_->GetRenderViewHost()->OnWebkitPreferencesChanged();
683 } 686 }
OLDNEW
« no previous file with comments | « chrome/browser/media/encrypted_media_browsertest.cc ('k') | chrome/common/pref_names.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698