Chromium Code Reviews| 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 128 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
| 139 smart_insert_delete_enabled(false), | 139 smart_insert_delete_enabled(false), |
| 140 #endif | 140 #endif |
| 141 cookie_enabled(true) | 141 cookie_enabled(true) |
| 142 #if defined(OS_ANDROID) | 142 #if defined(OS_ANDROID) |
| 143 , | 143 , |
| 144 text_autosizing_enabled(true), | 144 text_autosizing_enabled(true), |
| 145 font_scale_factor(1.0f), | 145 font_scale_factor(1.0f), |
| 146 force_enable_zoom(false), | 146 force_enable_zoom(false), |
| 147 double_tap_to_zoom_enabled(true), | 147 double_tap_to_zoom_enabled(true), |
| 148 user_gesture_required_for_media_playback(true), | 148 user_gesture_required_for_media_playback(true), |
| 149 support_deprecated_target_density_dpi(false) | 149 support_deprecated_target_density_dpi(false), |
| 150 use_wide_viewport(true) | |
|
joth
2013/04/16 19:41:47
Just to check, this affects all android users of c
mnaganov (inactive)
2013/04/17 08:40:56
For Chrome, nothing changes, as it uses wide viewp
| |
| 150 #endif | 151 #endif |
| 151 { | 152 { |
| 152 standard_font_family_map[kCommonScript] = | 153 standard_font_family_map[kCommonScript] = |
| 153 ASCIIToUTF16("Times New Roman"); | 154 ASCIIToUTF16("Times New Roman"); |
| 154 fixed_font_family_map[kCommonScript] = | 155 fixed_font_family_map[kCommonScript] = |
| 155 ASCIIToUTF16("Courier New"); | 156 ASCIIToUTF16("Courier New"); |
| 156 serif_font_family_map[kCommonScript] = | 157 serif_font_family_map[kCommonScript] = |
| 157 ASCIIToUTF16("Times New Roman"); | 158 ASCIIToUTF16("Times New Roman"); |
| 158 sans_serif_font_family_map[kCommonScript] = | 159 sans_serif_font_family_map[kCommonScript] = |
| 159 ASCIIToUTF16("Arial"); | 160 ASCIIToUTF16("Arial"); |
| (...skipping 306 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
| 466 settings->setTextAutosizingFontScaleFactor(font_scale_factor); | 467 settings->setTextAutosizingFontScaleFactor(font_scale_factor); |
| 467 web_view->setIgnoreViewportTagMaximumScale(force_enable_zoom); | 468 web_view->setIgnoreViewportTagMaximumScale(force_enable_zoom); |
| 468 settings->setAutoZoomFocusedNodeToLegibleScale(true); | 469 settings->setAutoZoomFocusedNodeToLegibleScale(true); |
| 469 settings->setDoubleTapToZoomEnabled(double_tap_to_zoom_enabled); | 470 settings->setDoubleTapToZoomEnabled(double_tap_to_zoom_enabled); |
| 470 settings->setMediaPlaybackRequiresUserGesture( | 471 settings->setMediaPlaybackRequiresUserGesture( |
| 471 user_gesture_required_for_media_playback); | 472 user_gesture_required_for_media_playback); |
| 472 settings->setDefaultVideoPosterURL( | 473 settings->setDefaultVideoPosterURL( |
| 473 ASCIIToUTF16(default_video_poster_url.spec())); | 474 ASCIIToUTF16(default_video_poster_url.spec())); |
| 474 settings->setSupportDeprecatedTargetDensityDPI( | 475 settings->setSupportDeprecatedTargetDensityDPI( |
| 475 support_deprecated_target_density_dpi); | 476 support_deprecated_target_density_dpi); |
| 477 settings->setUseWideViewport(use_wide_viewport); | |
| 476 #endif | 478 #endif |
| 477 | 479 |
| 478 WebNetworkStateNotifier::setOnLine(is_online); | 480 WebNetworkStateNotifier::setOnLine(is_online); |
| 479 } | 481 } |
| 480 | 482 |
| 481 #define COMPILE_ASSERT_MATCHING_ENUMS(webkit_glue_name, webkit_name) \ | 483 #define COMPILE_ASSERT_MATCHING_ENUMS(webkit_glue_name, webkit_name) \ |
| 482 COMPILE_ASSERT( \ | 484 COMPILE_ASSERT( \ |
| 483 static_cast<int>(webkit_glue_name) == static_cast<int>(webkit_name), \ | 485 static_cast<int>(webkit_glue_name) == static_cast<int>(webkit_name), \ |
| 484 mismatching_enums) | 486 mismatching_enums) |
| 485 | 487 |
| 486 COMPILE_ASSERT_MATCHING_ENUMS( | 488 COMPILE_ASSERT_MATCHING_ENUMS( |
| 487 WebPreferences::EDITING_BEHAVIOR_MAC, WebSettings::EditingBehaviorMac); | 489 WebPreferences::EDITING_BEHAVIOR_MAC, WebSettings::EditingBehaviorMac); |
| 488 COMPILE_ASSERT_MATCHING_ENUMS( | 490 COMPILE_ASSERT_MATCHING_ENUMS( |
| 489 WebPreferences::EDITING_BEHAVIOR_WIN, WebSettings::EditingBehaviorWin); | 491 WebPreferences::EDITING_BEHAVIOR_WIN, WebSettings::EditingBehaviorWin); |
| 490 COMPILE_ASSERT_MATCHING_ENUMS( | 492 COMPILE_ASSERT_MATCHING_ENUMS( |
| 491 WebPreferences::EDITING_BEHAVIOR_UNIX, WebSettings::EditingBehaviorUnix); | 493 WebPreferences::EDITING_BEHAVIOR_UNIX, WebSettings::EditingBehaviorUnix); |
| 492 COMPILE_ASSERT_MATCHING_ENUMS( | 494 COMPILE_ASSERT_MATCHING_ENUMS( |
| 493 WebPreferences::EDITING_BEHAVIOR_ANDROID, | 495 WebPreferences::EDITING_BEHAVIOR_ANDROID, |
| 494 WebSettings::EditingBehaviorAndroid); | 496 WebSettings::EditingBehaviorAndroid); |
| 495 | 497 |
| 496 } // namespace webkit_glue | 498 } // namespace webkit_glue |
| OLD | NEW |