| OLD | NEW |
| 1 // Copyright (c) 2009 The Chromium Authors. All rights reserved. | 1 // Copyright (c) 2009 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 "base/string_util.h" | 7 #include "base/string_util.h" |
| 8 #include "base/utf_string_conversions.h" | 8 #include "base/utf_string_conversions.h" |
| 9 #include "third_party/WebKit/WebKit/chromium/public/WebRuntimeFeatures.h" | 9 #include "third_party/WebKit/WebKit/chromium/public/WebRuntimeFeatures.h" |
| 10 #include "third_party/WebKit/WebKit/chromium/public/WebKit.h" | 10 #include "third_party/WebKit/WebKit/chromium/public/WebKit.h" |
| (...skipping 49 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 60 frame_flattening_enabled(false), | 60 frame_flattening_enabled(false), |
| 61 allow_universal_access_from_file_urls(false), | 61 allow_universal_access_from_file_urls(false), |
| 62 allow_file_access_from_file_urls(false), | 62 allow_file_access_from_file_urls(false), |
| 63 experimental_webgl_enabled(false), | 63 experimental_webgl_enabled(false), |
| 64 show_composited_layer_borders(false), | 64 show_composited_layer_borders(false), |
| 65 accelerated_compositing_enabled(false), | 65 accelerated_compositing_enabled(false), |
| 66 accelerated_layers_enabled(false), | 66 accelerated_layers_enabled(false), |
| 67 accelerated_video_enabled(false), | 67 accelerated_video_enabled(false), |
| 68 accelerated_2d_canvas_enabled(false), | 68 accelerated_2d_canvas_enabled(false), |
| 69 accelerated_plugins_enabled(false), | 69 accelerated_plugins_enabled(false), |
| 70 memory_info_enabled(false) { | 70 memory_info_enabled(false), |
| 71 interactive_form_validation_enabled(true) { |
| 71 } | 72 } |
| 72 | 73 |
| 73 WebPreferences::~WebPreferences() { | 74 WebPreferences::~WebPreferences() { |
| 74 } | 75 } |
| 75 | 76 |
| 76 void WebPreferences::Apply(WebView* web_view) const { | 77 void WebPreferences::Apply(WebView* web_view) const { |
| 77 WebSettings* settings = web_view->settings(); | 78 WebSettings* settings = web_view->settings(); |
| 78 settings->setStandardFontFamily(standard_font_family); | 79 settings->setStandardFontFamily(standard_font_family); |
| 79 settings->setFixedFontFamily(fixed_font_family); | 80 settings->setFixedFontFamily(fixed_font_family); |
| 80 settings->setSerifFontFamily(serif_font_family); | 81 settings->setSerifFontFamily(serif_font_family); |
| (...skipping 97 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 178 settings->setMemoryInfoEnabled(memory_info_enabled); | 179 settings->setMemoryInfoEnabled(memory_info_enabled); |
| 179 | 180 |
| 180 for (WebInspectorPreferences::const_iterator it = inspector_settings.begin(); | 181 for (WebInspectorPreferences::const_iterator it = inspector_settings.begin(); |
| 181 it != inspector_settings.end(); ++it) | 182 it != inspector_settings.end(); ++it) |
| 182 web_view->setInspectorSetting(WebString::fromUTF8(it->first), | 183 web_view->setInspectorSetting(WebString::fromUTF8(it->first), |
| 183 WebString::fromUTF8(it->second)); | 184 WebString::fromUTF8(it->second)); |
| 184 | 185 |
| 185 // Tabs to link is not part of the settings. WebCore calls | 186 // Tabs to link is not part of the settings. WebCore calls |
| 186 // ChromeClient::tabsToLinks which is part of the glue code. | 187 // ChromeClient::tabsToLinks which is part of the glue code. |
| 187 web_view->setTabsToLinks(tabs_to_links); | 188 web_view->setTabsToLinks(tabs_to_links); |
| 189 |
| 190 settings->setInteractiveFormValidationEnabled( |
| 191 interactive_form_validation_enabled); |
| 188 } | 192 } |
| OLD | NEW |