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

Side by Side Diff: content/public/common/web_preferences.cc

Issue 1260163005: Appease jschuh@ by adding a field trial to move 'plugin' to blockable mixed content. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@settingh
Patch Set: Created 5 years, 4 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 | « content/public/common/web_preferences.h ('k') | content/renderer/render_view_impl.cc » ('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 2014 The Chromium Authors. All rights reserved. 1 // Copyright 2014 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/public/common/web_preferences.h" 5 #include "content/public/common/web_preferences.h"
6 6
7 #include "base/basictypes.h" 7 #include "base/basictypes.h"
8 #include "base/strings/string_util.h" 8 #include "base/strings/string_util.h"
9 #include "base/strings/utf_string_conversions.h" 9 #include "base/strings/utf_string_conversions.h"
10 #include "third_party/WebKit/public/web/WebSettings.h" 10 #include "third_party/WebKit/public/web/WebSettings.h"
(...skipping 110 matching lines...) Expand 10 before | Expand all | Expand 10 after
121 accelerated_filters_enabled(false), 121 accelerated_filters_enabled(false),
122 deferred_filters_enabled(false), 122 deferred_filters_enabled(false),
123 container_culling_enabled(false), 123 container_culling_enabled(false),
124 text_blobs_enabled(false), 124 text_blobs_enabled(false),
125 allow_displaying_insecure_content(true), 125 allow_displaying_insecure_content(true),
126 allow_running_insecure_content(false), 126 allow_running_insecure_content(false),
127 disable_reading_from_canvas(false), 127 disable_reading_from_canvas(false),
128 strict_mixed_content_checking(false), 128 strict_mixed_content_checking(false),
129 strict_powerful_feature_restrictions(false), 129 strict_powerful_feature_restrictions(false),
130 strictly_block_blockable_mixed_content(false), 130 strictly_block_blockable_mixed_content(false),
131 block_mixed_plugin_content(false),
131 password_echo_enabled(false), 132 password_echo_enabled(false),
132 should_print_backgrounds(false), 133 should_print_backgrounds(false),
133 should_clear_document_background(true), 134 should_clear_document_background(true),
134 enable_scroll_animator(false), 135 enable_scroll_animator(false),
135 touch_enabled(false), 136 touch_enabled(false),
136 device_supports_touch(false), 137 device_supports_touch(false),
137 device_supports_mouse(true), 138 device_supports_mouse(true),
138 touch_adjustment_enabled(true), 139 touch_adjustment_enabled(true),
139 pointer_events_max_touch_points(0), 140 pointer_events_max_touch_points(0),
140 available_pointer_types(0), 141 available_pointer_types(0),
(...skipping 75 matching lines...) Expand 10 before | Expand all | Expand 10 after
216 cursive_font_family_map[kCommonScript] = base::ASCIIToUTF16("Script"); 217 cursive_font_family_map[kCommonScript] = base::ASCIIToUTF16("Script");
217 fantasy_font_family_map[kCommonScript] = base::ASCIIToUTF16("Impact"); 218 fantasy_font_family_map[kCommonScript] = base::ASCIIToUTF16("Impact");
218 pictograph_font_family_map[kCommonScript] = 219 pictograph_font_family_map[kCommonScript] =
219 base::ASCIIToUTF16("Times New Roman"); 220 base::ASCIIToUTF16("Times New Roman");
220 } 221 }
221 222
222 WebPreferences::~WebPreferences() { 223 WebPreferences::~WebPreferences() {
223 } 224 }
224 225
225 } // namespace content 226 } // namespace content
OLDNEW
« no previous file with comments | « content/public/common/web_preferences.h ('k') | content/renderer/render_view_impl.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698