OLD | NEW |
1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. | 1 // Copyright (c) 2012 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/basictypes.h" | 7 #include "base/basictypes.h" |
8 #include "base/string_util.h" | 8 #include "base/string_util.h" |
9 #include "base/utf_string_conversions.h" | 9 #include "base/utf_string_conversions.h" |
10 #include "third_party/WebKit/Source/Platform/chromium/public/WebSize.h" | 10 #include "third_party/WebKit/Source/Platform/chromium/public/WebSize.h" |
(...skipping 112 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
123 supports_multiple_windows(true), | 123 supports_multiple_windows(true), |
124 viewport_enabled(false), | 124 viewport_enabled(false), |
125 initialize_at_minimum_page_scale(true), | 125 initialize_at_minimum_page_scale(true), |
126 #if defined(OS_MACOSX) | 126 #if defined(OS_MACOSX) |
127 smart_insert_delete_enabled(true), | 127 smart_insert_delete_enabled(true), |
128 #else | 128 #else |
129 smart_insert_delete_enabled(false), | 129 smart_insert_delete_enabled(false), |
130 #endif | 130 #endif |
131 spatial_navigation_enabled(false), | 131 spatial_navigation_enabled(false), |
132 experimental_websocket_enabled(false), | 132 experimental_websocket_enabled(false), |
| 133 pinch_virtual_viewport_enabled(false), |
133 cookie_enabled(true) | 134 cookie_enabled(true) |
134 #if defined(OS_ANDROID) | 135 #if defined(OS_ANDROID) |
135 , | 136 , |
136 text_autosizing_enabled(true), | 137 text_autosizing_enabled(true), |
137 font_scale_factor(1.0f), | 138 font_scale_factor(1.0f), |
138 force_enable_zoom(false), | 139 force_enable_zoom(false), |
139 double_tap_to_zoom_enabled(true), | 140 double_tap_to_zoom_enabled(true), |
140 user_gesture_required_for_media_playback(true), | 141 user_gesture_required_for_media_playback(true), |
141 support_deprecated_target_density_dpi(false), | 142 support_deprecated_target_density_dpi(false), |
142 use_wide_viewport(true) | 143 use_wide_viewport(true) |
(...skipping 330 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
473 settings->setDefaultVideoPosterURL( | 474 settings->setDefaultVideoPosterURL( |
474 ASCIIToUTF16(prefs.default_video_poster_url.spec())); | 475 ASCIIToUTF16(prefs.default_video_poster_url.spec())); |
475 settings->setSupportDeprecatedTargetDensityDPI( | 476 settings->setSupportDeprecatedTargetDensityDPI( |
476 prefs.support_deprecated_target_density_dpi); | 477 prefs.support_deprecated_target_density_dpi); |
477 settings->setUseWideViewport(prefs.use_wide_viewport); | 478 settings->setUseWideViewport(prefs.use_wide_viewport); |
478 #endif | 479 #endif |
479 | 480 |
480 WebNetworkStateNotifier::setOnLine(prefs.is_online); | 481 WebNetworkStateNotifier::setOnLine(prefs.is_online); |
481 settings->setExperimentalWebSocketEnabled( | 482 settings->setExperimentalWebSocketEnabled( |
482 prefs.experimental_websocket_enabled); | 483 prefs.experimental_websocket_enabled); |
| 484 settings->setPinchVirtualViewportEnabled( |
| 485 prefs.pinch_virtual_viewport_enabled); |
483 } | 486 } |
484 | 487 |
485 #define COMPILE_ASSERT_MATCHING_ENUMS(webkit_glue_name, webkit_name) \ | 488 #define COMPILE_ASSERT_MATCHING_ENUMS(webkit_glue_name, webkit_name) \ |
486 COMPILE_ASSERT( \ | 489 COMPILE_ASSERT( \ |
487 static_cast<int>(webkit_glue_name) == static_cast<int>(webkit_name), \ | 490 static_cast<int>(webkit_glue_name) == static_cast<int>(webkit_name), \ |
488 mismatching_enums) | 491 mismatching_enums) |
489 | 492 |
490 COMPILE_ASSERT_MATCHING_ENUMS( | 493 COMPILE_ASSERT_MATCHING_ENUMS( |
491 webkit_glue::EDITING_BEHAVIOR_MAC, WebSettings::EditingBehaviorMac); | 494 webkit_glue::EDITING_BEHAVIOR_MAC, WebSettings::EditingBehaviorMac); |
492 COMPILE_ASSERT_MATCHING_ENUMS( | 495 COMPILE_ASSERT_MATCHING_ENUMS( |
493 webkit_glue::EDITING_BEHAVIOR_WIN, WebSettings::EditingBehaviorWin); | 496 webkit_glue::EDITING_BEHAVIOR_WIN, WebSettings::EditingBehaviorWin); |
494 COMPILE_ASSERT_MATCHING_ENUMS( | 497 COMPILE_ASSERT_MATCHING_ENUMS( |
495 webkit_glue::EDITING_BEHAVIOR_UNIX, WebSettings::EditingBehaviorUnix); | 498 webkit_glue::EDITING_BEHAVIOR_UNIX, WebSettings::EditingBehaviorUnix); |
496 COMPILE_ASSERT_MATCHING_ENUMS( | 499 COMPILE_ASSERT_MATCHING_ENUMS( |
497 webkit_glue::EDITING_BEHAVIOR_ANDROID, WebSettings::EditingBehaviorAndroid); | 500 webkit_glue::EDITING_BEHAVIOR_ANDROID, WebSettings::EditingBehaviorAndroid); |
498 | 501 |
499 } // namespace webkit_glue | 502 } // namespace webkit_glue |
OLD | NEW |