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 474 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
485 settings->setMediaPlaybackRequiresUserGesture( | 485 settings->setMediaPlaybackRequiresUserGesture( |
486 prefs.user_gesture_required_for_media_playback); | 486 prefs.user_gesture_required_for_media_playback); |
487 settings->setDefaultVideoPosterURL( | 487 settings->setDefaultVideoPosterURL( |
488 ASCIIToUTF16(prefs.default_video_poster_url.spec())); | 488 ASCIIToUTF16(prefs.default_video_poster_url.spec())); |
489 settings->setSupportDeprecatedTargetDensityDPI( | 489 settings->setSupportDeprecatedTargetDensityDPI( |
490 prefs.support_deprecated_target_density_dpi); | 490 prefs.support_deprecated_target_density_dpi); |
491 settings->setUseWideViewport(prefs.use_wide_viewport); | 491 settings->setUseWideViewport(prefs.use_wide_viewport); |
492 #endif | 492 #endif |
493 | 493 |
494 WebNetworkStateNotifier::setOnLine(prefs.is_online); | 494 WebNetworkStateNotifier::setOnLine(prefs.is_online); |
| 495 |
| 496 settings->settingsChanged(); |
495 } | 497 } |
496 | 498 |
497 #define COMPILE_ASSERT_MATCHING_ENUMS(webkit_glue_name, webkit_name) \ | 499 #define COMPILE_ASSERT_MATCHING_ENUMS(webkit_glue_name, webkit_name) \ |
498 COMPILE_ASSERT( \ | 500 COMPILE_ASSERT( \ |
499 static_cast<int>(webkit_glue_name) == static_cast<int>(webkit_name), \ | 501 static_cast<int>(webkit_glue_name) == static_cast<int>(webkit_name), \ |
500 mismatching_enums) | 502 mismatching_enums) |
501 | 503 |
502 COMPILE_ASSERT_MATCHING_ENUMS( | 504 COMPILE_ASSERT_MATCHING_ENUMS( |
503 webkit_glue::EDITING_BEHAVIOR_MAC, WebSettings::EditingBehaviorMac); | 505 webkit_glue::EDITING_BEHAVIOR_MAC, WebSettings::EditingBehaviorMac); |
504 COMPILE_ASSERT_MATCHING_ENUMS( | 506 COMPILE_ASSERT_MATCHING_ENUMS( |
505 webkit_glue::EDITING_BEHAVIOR_WIN, WebSettings::EditingBehaviorWin); | 507 webkit_glue::EDITING_BEHAVIOR_WIN, WebSettings::EditingBehaviorWin); |
506 COMPILE_ASSERT_MATCHING_ENUMS( | 508 COMPILE_ASSERT_MATCHING_ENUMS( |
507 webkit_glue::EDITING_BEHAVIOR_UNIX, WebSettings::EditingBehaviorUnix); | 509 webkit_glue::EDITING_BEHAVIOR_UNIX, WebSettings::EditingBehaviorUnix); |
508 COMPILE_ASSERT_MATCHING_ENUMS( | 510 COMPILE_ASSERT_MATCHING_ENUMS( |
509 webkit_glue::EDITING_BEHAVIOR_ANDROID, WebSettings::EditingBehaviorAndroid); | 511 webkit_glue::EDITING_BEHAVIOR_ANDROID, WebSettings::EditingBehaviorAndroid); |
510 | 512 |
511 } // namespace webkit_glue | 513 } // namespace webkit_glue |
512 | 514 |
OLD | NEW |