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 126 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
137 editing_behavior(EDITING_BEHAVIOR_WIN), | 137 editing_behavior(EDITING_BEHAVIOR_WIN), |
138 #elif defined(OS_ANDROID) | 138 #elif defined(OS_ANDROID) |
139 editing_behavior(EDITING_BEHAVIOR_ANDROID), | 139 editing_behavior(EDITING_BEHAVIOR_ANDROID), |
140 #elif defined(OS_POSIX) | 140 #elif defined(OS_POSIX) |
141 editing_behavior(EDITING_BEHAVIOR_UNIX), | 141 editing_behavior(EDITING_BEHAVIOR_UNIX), |
142 #else | 142 #else |
143 editing_behavior(EDITING_BEHAVIOR_MAC), | 143 editing_behavior(EDITING_BEHAVIOR_MAC), |
144 #endif | 144 #endif |
145 supports_multiple_windows(true), | 145 supports_multiple_windows(true), |
146 viewport_enabled(false), | 146 viewport_enabled(false), |
| 147 initialize_at_minimum_page_scale(true), |
147 record_rendering_stats(false), | 148 record_rendering_stats(false), |
148 cookie_enabled(true) | 149 cookie_enabled(true) |
149 #if defined(OS_ANDROID) | 150 #if defined(OS_ANDROID) |
150 , | 151 , |
151 text_autosizing_enabled(true), | 152 text_autosizing_enabled(true), |
152 font_scale_factor(1.0f), | 153 font_scale_factor(1.0f), |
153 force_enable_zoom(false), | 154 force_enable_zoom(false), |
154 user_gesture_required_for_media_playback(true) | 155 user_gesture_required_for_media_playback(true) |
155 #endif | 156 #endif |
156 { | 157 { |
(...skipping 324 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
481 settings->setDeferredImageDecodingEnabled(deferred_image_decoding_enabled); | 482 settings->setDeferredImageDecodingEnabled(deferred_image_decoding_enabled); |
482 settings->setShouldRespectImageOrientation(should_respect_image_orientation); | 483 settings->setShouldRespectImageOrientation(should_respect_image_orientation); |
483 | 484 |
484 settings->setUnsafePluginPastingEnabled(false); | 485 settings->setUnsafePluginPastingEnabled(false); |
485 settings->setEditingBehavior( | 486 settings->setEditingBehavior( |
486 static_cast<WebSettings::EditingBehavior>(editing_behavior)); | 487 static_cast<WebSettings::EditingBehavior>(editing_behavior)); |
487 | 488 |
488 settings->setSupportsMultipleWindows(supports_multiple_windows); | 489 settings->setSupportsMultipleWindows(supports_multiple_windows); |
489 | 490 |
490 settings->setViewportEnabled(viewport_enabled); | 491 settings->setViewportEnabled(viewport_enabled); |
| 492 settings->setInitializeAtMinimumPageScale(initialize_at_minimum_page_scale); |
491 | 493 |
492 #if defined(OS_ANDROID) | 494 #if defined(OS_ANDROID) |
493 settings->setAllowCustomScrollbarInMainFrame(false); | 495 settings->setAllowCustomScrollbarInMainFrame(false); |
494 settings->setTextAutosizingEnabled(text_autosizing_enabled); | 496 settings->setTextAutosizingEnabled(text_autosizing_enabled); |
495 settings->setTextAutosizingFontScaleFactor(font_scale_factor); | 497 settings->setTextAutosizingFontScaleFactor(font_scale_factor); |
496 web_view->setIgnoreViewportTagMaximumScale(force_enable_zoom); | 498 web_view->setIgnoreViewportTagMaximumScale(force_enable_zoom); |
497 settings->setAutoZoomFocusedNodeToLegibleScale(true); | 499 settings->setAutoZoomFocusedNodeToLegibleScale(true); |
498 settings->setDoubleTapToZoomEnabled(true); | 500 settings->setDoubleTapToZoomEnabled(true); |
499 settings->setMediaPlaybackRequiresUserGesture( | 501 settings->setMediaPlaybackRequiresUserGesture( |
500 user_gesture_required_for_media_playback); | 502 user_gesture_required_for_media_playback); |
(...skipping 11 matching lines...) Expand all Loading... |
512 WebPreferences::EDITING_BEHAVIOR_MAC, WebSettings::EditingBehaviorMac); | 514 WebPreferences::EDITING_BEHAVIOR_MAC, WebSettings::EditingBehaviorMac); |
513 COMPILE_ASSERT_MATCHING_ENUMS( | 515 COMPILE_ASSERT_MATCHING_ENUMS( |
514 WebPreferences::EDITING_BEHAVIOR_WIN, WebSettings::EditingBehaviorWin); | 516 WebPreferences::EDITING_BEHAVIOR_WIN, WebSettings::EditingBehaviorWin); |
515 COMPILE_ASSERT_MATCHING_ENUMS( | 517 COMPILE_ASSERT_MATCHING_ENUMS( |
516 WebPreferences::EDITING_BEHAVIOR_UNIX, WebSettings::EditingBehaviorUnix); | 518 WebPreferences::EDITING_BEHAVIOR_UNIX, WebSettings::EditingBehaviorUnix); |
517 COMPILE_ASSERT_MATCHING_ENUMS( | 519 COMPILE_ASSERT_MATCHING_ENUMS( |
518 WebPreferences::EDITING_BEHAVIOR_ANDROID, | 520 WebPreferences::EDITING_BEHAVIOR_ANDROID, |
519 WebSettings::EditingBehaviorAndroid); | 521 WebSettings::EditingBehaviorAndroid); |
520 | 522 |
521 } // namespace webkit_glue | 523 } // namespace webkit_glue |
OLD | NEW |