OLD | NEW |
1 // Copyright 2013 The Chromium Authors. All rights reserved. | 1 // Copyright 2013 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/renderer/web_preferences.h" | 5 #include "content/public/renderer/web_preferences.h" |
6 | 6 |
7 #include "base/strings/utf_string_conversions.h" | 7 #include "base/strings/utf_string_conversions.h" |
8 #include "third_party/WebKit/public/platform/WebString.h" | 8 #include "third_party/WebKit/public/platform/WebString.h" |
9 #include "third_party/WebKit/public/platform/WebURL.h" | 9 #include "third_party/WebKit/public/platform/WebURL.h" |
10 #include "third_party/WebKit/public/web/WebKit.h" | 10 #include "third_party/WebKit/public/web/WebKit.h" |
(...skipping 267 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
278 it != prefs.inspector_settings.end(); | 278 it != prefs.inspector_settings.end(); |
279 ++it) { | 279 ++it) { |
280 web_view->setInspectorSetting(WebString::fromUTF8(it->first), | 280 web_view->setInspectorSetting(WebString::fromUTF8(it->first), |
281 WebString::fromUTF8(it->second)); | 281 WebString::fromUTF8(it->second)); |
282 } | 282 } |
283 | 283 |
284 // Tabs to link is not part of the settings. WebCore calls | 284 // Tabs to link is not part of the settings. WebCore calls |
285 // ChromeClient::tabsToLinks which is part of the glue code. | 285 // ChromeClient::tabsToLinks which is part of the glue code. |
286 web_view->setTabsToLinks(prefs.tabs_to_links); | 286 web_view->setTabsToLinks(prefs.tabs_to_links); |
287 | 287 |
288 settings->setFullScreenEnabled(prefs.fullscreen_enabled); | 288 // TODO(scheib): crbug.com/344002 Remove FullScreenEnabled from Blink |
| 289 settings->setFullScreenEnabled(true); |
289 settings->setAllowDisplayOfInsecureContent( | 290 settings->setAllowDisplayOfInsecureContent( |
290 prefs.allow_displaying_insecure_content); | 291 prefs.allow_displaying_insecure_content); |
291 settings->setAllowRunningOfInsecureContent( | 292 settings->setAllowRunningOfInsecureContent( |
292 prefs.allow_running_insecure_content); | 293 prefs.allow_running_insecure_content); |
293 settings->setPasswordEchoEnabled(prefs.password_echo_enabled); | 294 settings->setPasswordEchoEnabled(prefs.password_echo_enabled); |
294 settings->setShouldPrintBackgrounds(prefs.should_print_backgrounds); | 295 settings->setShouldPrintBackgrounds(prefs.should_print_backgrounds); |
295 settings->setShouldClearDocumentBackground( | 296 settings->setShouldClearDocumentBackground( |
296 prefs.should_clear_document_background); | 297 prefs.should_clear_document_background); |
297 settings->setEnableScrollAnimator(prefs.enable_scroll_animator); | 298 settings->setEnableScrollAnimator(prefs.enable_scroll_animator); |
298 settings->setVisualWordMovementEnabled(prefs.visual_word_movement_enabled); | 299 settings->setVisualWordMovementEnabled(prefs.visual_word_movement_enabled); |
(...skipping 77 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
376 settings->setPinchVirtualViewportEnabled( | 377 settings->setPinchVirtualViewportEnabled( |
377 prefs.pinch_virtual_viewport_enabled); | 378 prefs.pinch_virtual_viewport_enabled); |
378 | 379 |
379 settings->setPinchOverlayScrollbarThickness( | 380 settings->setPinchOverlayScrollbarThickness( |
380 prefs.pinch_overlay_scrollbar_thickness); | 381 prefs.pinch_overlay_scrollbar_thickness); |
381 settings->setUseSolidColorScrollbars(prefs.use_solid_color_scrollbars); | 382 settings->setUseSolidColorScrollbars(prefs.use_solid_color_scrollbars); |
382 settings->setCompositorTouchHitTesting(prefs.compositor_touch_hit_testing); | 383 settings->setCompositorTouchHitTesting(prefs.compositor_touch_hit_testing); |
383 } | 384 } |
384 | 385 |
385 } // namespace content | 386 } // namespace content |
OLD | NEW |