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

Side by Side Diff: webkit/glue/webpreferences.cc

Issue 9255018: Add a per-tab preference to match WebSettings::images_enabled. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 8 years, 11 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 | « webkit/glue/webpreferences.h ('k') | 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 // Copyright (c) 2011 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2011 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 "webkit/glue/webpreferences.h" 5 #include "webkit/glue/webpreferences.h"
6 6
7 #include <unicode/uchar.h> 7 #include <unicode/uchar.h>
8 8
9 #include "base/string_util.h" 9 #include "base/string_util.h"
10 #include "base/utf_string_conversions.h" 10 #include "base/utf_string_conversions.h"
(...skipping 24 matching lines...) Expand all
35 default_font_size(16), 35 default_font_size(16),
36 default_fixed_font_size(13), 36 default_fixed_font_size(13),
37 minimum_font_size(0), 37 minimum_font_size(0),
38 minimum_logical_font_size(6), 38 minimum_logical_font_size(6),
39 default_encoding("ISO-8859-1"), 39 default_encoding("ISO-8859-1"),
40 javascript_enabled(true), 40 javascript_enabled(true),
41 dart_enabled(true), 41 dart_enabled(true),
42 web_security_enabled(true), 42 web_security_enabled(true),
43 javascript_can_open_windows_automatically(true), 43 javascript_can_open_windows_automatically(true),
44 loads_images_automatically(true), 44 loads_images_automatically(true),
45 images_enabled(true),
45 plugins_enabled(true), 46 plugins_enabled(true),
46 dom_paste_enabled(false), // enables execCommand("paste") 47 dom_paste_enabled(false), // enables execCommand("paste")
47 developer_extras_enabled(false), // Requires extra work by embedder 48 developer_extras_enabled(false), // Requires extra work by embedder
48 site_specific_quirks_enabled(false), 49 site_specific_quirks_enabled(false),
49 shrinks_standalone_images_to_fit(true), 50 shrinks_standalone_images_to_fit(true),
50 uses_universal_detector(false), // Disabled: page cycler regression 51 uses_universal_detector(false), // Disabled: page cycler regression
51 text_areas_are_resizable(true), 52 text_areas_are_resizable(true),
52 java_enabled(true), 53 java_enabled(true),
53 allow_scripts_to_close_windows(false), 54 allow_scripts_to_close_windows(false),
54 uses_page_cache(false), 55 uses_page_cache(false),
(...skipping 128 matching lines...) Expand 10 before | Expand all | Expand 10 after
183 settings->setMinimumLogicalFontSize(minimum_logical_font_size); 184 settings->setMinimumLogicalFontSize(minimum_logical_font_size);
184 settings->setDefaultTextEncodingName(ASCIIToUTF16(default_encoding)); 185 settings->setDefaultTextEncodingName(ASCIIToUTF16(default_encoding));
185 settings->setJavaScriptEnabled(javascript_enabled); 186 settings->setJavaScriptEnabled(javascript_enabled);
186 #if WEBKIT_USING_DART 187 #if WEBKIT_USING_DART
187 settings->setDartEnabled(dart_enabled); 188 settings->setDartEnabled(dart_enabled);
188 #endif 189 #endif
189 settings->setWebSecurityEnabled(web_security_enabled); 190 settings->setWebSecurityEnabled(web_security_enabled);
190 settings->setJavaScriptCanOpenWindowsAutomatically( 191 settings->setJavaScriptCanOpenWindowsAutomatically(
191 javascript_can_open_windows_automatically); 192 javascript_can_open_windows_automatically);
192 settings->setLoadsImagesAutomatically(loads_images_automatically); 193 settings->setLoadsImagesAutomatically(loads_images_automatically);
194 settings->setImagesEnabled(images_enabled);
193 settings->setPluginsEnabled(plugins_enabled); 195 settings->setPluginsEnabled(plugins_enabled);
194 settings->setDOMPasteAllowed(dom_paste_enabled); 196 settings->setDOMPasteAllowed(dom_paste_enabled);
195 settings->setDeveloperExtrasEnabled(developer_extras_enabled); 197 settings->setDeveloperExtrasEnabled(developer_extras_enabled);
196 settings->setNeedsSiteSpecificQuirks(site_specific_quirks_enabled); 198 settings->setNeedsSiteSpecificQuirks(site_specific_quirks_enabled);
197 settings->setShrinksStandaloneImagesToFit(shrinks_standalone_images_to_fit); 199 settings->setShrinksStandaloneImagesToFit(shrinks_standalone_images_to_fit);
198 settings->setUsesEncodingDetector(uses_universal_detector); 200 settings->setUsesEncodingDetector(uses_universal_detector);
199 settings->setTextAreasAreResizable(text_areas_are_resizable); 201 settings->setTextAreasAreResizable(text_areas_are_resizable);
200 settings->setAllowScriptsToCloseWindows(allow_scripts_to_close_windows); 202 settings->setAllowScriptsToCloseWindows(allow_scripts_to_close_windows);
201 if (user_style_sheet_enabled) 203 if (user_style_sheet_enabled)
202 settings->setUserStyleSheetLocation(user_style_sheet_location); 204 settings->setUserStyleSheetLocation(user_style_sheet_location);
(...skipping 134 matching lines...) Expand 10 before | Expand all | Expand 10 after
337 settings->setEnableScrollAnimator(enable_scroll_animator); 339 settings->setEnableScrollAnimator(enable_scroll_animator);
338 settings->setHixie76WebSocketProtocolEnabled( 340 settings->setHixie76WebSocketProtocolEnabled(
339 hixie76_websocket_protocol_enabled); 341 hixie76_websocket_protocol_enabled);
340 settings->setVisualWordMovementEnabled(visual_word_movement_enabled); 342 settings->setVisualWordMovementEnabled(visual_word_movement_enabled);
341 343
342 // Enable per-tile painting if requested on the command line. 344 // Enable per-tile painting if requested on the command line.
343 settings->setPerTilePaintingEnabled(per_tile_painting_enabled); 345 settings->setPerTilePaintingEnabled(per_tile_painting_enabled);
344 346
345 WebNetworkStateNotifier::setOnLine(is_online); 347 WebNetworkStateNotifier::setOnLine(is_online);
346 } 348 }
OLDNEW
« no previous file with comments | « webkit/glue/webpreferences.h ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698