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/Source/WebKit/chromium/public/WebRuntimeFeatures.h" | 9 #include "third_party/WebKit/Source/WebKit/chromium/public/WebRuntimeFeatures.h" |
10 #include "third_party/WebKit/Source/WebKit/chromium/public/WebKit.h" | 10 #include "third_party/WebKit/Source/WebKit/chromium/public/WebKit.h" |
(...skipping 52 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
63 webaudio_enabled(false), | 63 webaudio_enabled(false), |
64 experimental_webgl_enabled(false), | 64 experimental_webgl_enabled(false), |
65 gl_multisampling_enabled(true), | 65 gl_multisampling_enabled(true), |
66 show_composited_layer_borders(false), | 66 show_composited_layer_borders(false), |
67 accelerated_compositing_enabled(false), | 67 accelerated_compositing_enabled(false), |
68 accelerated_layers_enabled(false), | 68 accelerated_layers_enabled(false), |
69 accelerated_video_enabled(false), | 69 accelerated_video_enabled(false), |
70 accelerated_2d_canvas_enabled(false), | 70 accelerated_2d_canvas_enabled(false), |
71 accelerated_plugins_enabled(false), | 71 accelerated_plugins_enabled(false), |
72 memory_info_enabled(false), | 72 memory_info_enabled(false), |
73 interactive_form_validation_enabled(true) { | 73 interactive_form_validation_enabled(true), |
74 minimum_timer_interval(webkit_glue::kForegroundTabTimerInterval) { | |
74 } | 75 } |
75 | 76 |
76 WebPreferences::~WebPreferences() { | 77 WebPreferences::~WebPreferences() { |
77 } | 78 } |
78 | 79 |
79 void WebPreferences::Apply(WebView* web_view) const { | 80 void WebPreferences::Apply(WebView* web_view) const { |
80 WebSettings* settings = web_view->settings(); | 81 WebSettings* settings = web_view->settings(); |
81 settings->setStandardFontFamily(standard_font_family); | 82 settings->setStandardFontFamily(standard_font_family); |
82 settings->setFixedFontFamily(fixed_font_family); | 83 settings->setFixedFontFamily(fixed_font_family); |
83 settings->setSerifFontFamily(serif_font_family); | 84 settings->setSerifFontFamily(serif_font_family); |
(...skipping 106 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
190 it != inspector_settings.end(); ++it) | 191 it != inspector_settings.end(); ++it) |
191 web_view->setInspectorSetting(WebString::fromUTF8(it->first), | 192 web_view->setInspectorSetting(WebString::fromUTF8(it->first), |
192 WebString::fromUTF8(it->second)); | 193 WebString::fromUTF8(it->second)); |
193 | 194 |
194 // Tabs to link is not part of the settings. WebCore calls | 195 // Tabs to link is not part of the settings. WebCore calls |
195 // ChromeClient::tabsToLinks which is part of the glue code. | 196 // ChromeClient::tabsToLinks which is part of the glue code. |
196 web_view->setTabsToLinks(tabs_to_links); | 197 web_view->setTabsToLinks(tabs_to_links); |
197 | 198 |
198 settings->setInteractiveFormValidationEnabled( | 199 settings->setInteractiveFormValidationEnabled( |
199 interactive_form_validation_enabled); | 200 interactive_form_validation_enabled); |
201 | |
202 settings->setMinimumTimerInterval(minimum_timer_interval); | |
darin (slow to review)
2011/02/17 06:42:32
here, you can just pass webkit_glue::kForegroundTa
Ken Russell (switch to Gerrit)
2011/02/18 01:05:54
Using kBackgroundTabTimerInterval seems to work we
| |
200 } | 203 } |
OLD | NEW |