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

Side by Side Diff: content/renderer/render_view_impl.cc

Issue 2681383003: media: Add a web preference to enable encrypted media (Closed)
Patch Set: 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
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 "content/renderer/render_view_impl.h" 5 #include "content/renderer/render_view_impl.h"
6 6
7 #include <algorithm> 7 #include <algorithm>
8 #include <cmath> 8 #include <cmath>
9 #include <memory> 9 #include <memory>
10 10
(...skipping 819 matching lines...) Expand 10 before | Expand all | Expand 10 after
830 settings->setMinimumLogicalFontSize(prefs.minimum_logical_font_size); 830 settings->setMinimumLogicalFontSize(prefs.minimum_logical_font_size);
831 settings->setDefaultTextEncodingName( 831 settings->setDefaultTextEncodingName(
832 WebString::fromASCII(prefs.default_encoding)); 832 WebString::fromASCII(prefs.default_encoding));
833 settings->setJavaScriptEnabled(prefs.javascript_enabled); 833 settings->setJavaScriptEnabled(prefs.javascript_enabled);
834 settings->setWebSecurityEnabled(prefs.web_security_enabled); 834 settings->setWebSecurityEnabled(prefs.web_security_enabled);
835 settings->setJavaScriptCanOpenWindowsAutomatically( 835 settings->setJavaScriptCanOpenWindowsAutomatically(
836 prefs.javascript_can_open_windows_automatically); 836 prefs.javascript_can_open_windows_automatically);
837 settings->setLoadsImagesAutomatically(prefs.loads_images_automatically); 837 settings->setLoadsImagesAutomatically(prefs.loads_images_automatically);
838 settings->setImagesEnabled(prefs.images_enabled); 838 settings->setImagesEnabled(prefs.images_enabled);
839 settings->setPluginsEnabled(prefs.plugins_enabled); 839 settings->setPluginsEnabled(prefs.plugins_enabled);
840 settings->setEncryptedMediaEnabled(prefs.encrypted_media_enabled);
840 settings->setDOMPasteAllowed(prefs.dom_paste_enabled); 841 settings->setDOMPasteAllowed(prefs.dom_paste_enabled);
841 settings->setTextAreasAreResizable(prefs.text_areas_are_resizable); 842 settings->setTextAreasAreResizable(prefs.text_areas_are_resizable);
842 settings->setAllowScriptsToCloseWindows(prefs.allow_scripts_to_close_windows); 843 settings->setAllowScriptsToCloseWindows(prefs.allow_scripts_to_close_windows);
843 settings->setDownloadableBinaryFontsEnabled(prefs.remote_fonts_enabled); 844 settings->setDownloadableBinaryFontsEnabled(prefs.remote_fonts_enabled);
844 settings->setJavaScriptCanAccessClipboard( 845 settings->setJavaScriptCanAccessClipboard(
845 prefs.javascript_can_access_clipboard); 846 prefs.javascript_can_access_clipboard);
846 WebRuntimeFeatures::enableXSLT(prefs.xslt_enabled); 847 WebRuntimeFeatures::enableXSLT(prefs.xslt_enabled);
847 settings->setXSSAuditorEnabled(prefs.xss_auditor_enabled); 848 settings->setXSSAuditorEnabled(prefs.xss_auditor_enabled);
848 settings->setDNSPrefetchingEnabled(prefs.dns_prefetching_enabled); 849 settings->setDNSPrefetchingEnabled(prefs.dns_prefetching_enabled);
849 settings->setDataSaverEnabled(prefs.data_saver_enabled); 850 settings->setDataSaverEnabled(prefs.data_saver_enabled);
(...skipping 1885 matching lines...) Expand 10 before | Expand all | Expand 10 after
2735 INPUT_EVENT_ACK_STATE_NOT_CONSUMED); 2736 INPUT_EVENT_ACK_STATE_NOT_CONSUMED);
2736 } 2737 }
2737 2738
2738 std::unique_ptr<InputEventAck> ack( 2739 std::unique_ptr<InputEventAck> ack(
2739 new InputEventAck(InputEventAckSource::MAIN_THREAD, input_event->type(), 2740 new InputEventAck(InputEventAckSource::MAIN_THREAD, input_event->type(),
2740 INPUT_EVENT_ACK_STATE_NOT_CONSUMED)); 2741 INPUT_EVENT_ACK_STATE_NOT_CONSUMED));
2741 OnInputEventAck(std::move(ack)); 2742 OnInputEventAck(std::move(ack));
2742 } 2743 }
2743 2744
2744 } // namespace content 2745 } // namespace content
OLDNEW
« no previous file with comments | « content/public/common/web_preferences.cc ('k') | third_party/WebKit/Source/core/frame/Settings.json5 » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698