| 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 "content/renderer/render_view_impl.h" | 5 #include "content/renderer/render_view_impl.h" |
| 6 | 6 |
| 7 #include <algorithm> | 7 #include <algorithm> |
| 8 #include <cmath> | 8 #include <cmath> |
| 9 | 9 |
| 10 #include "base/auto_reset.h" | 10 #include "base/auto_reset.h" |
| (...skipping 1028 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 1039 prefs.image_color_profiles_enabled); | 1039 prefs.image_color_profiles_enabled); |
| 1040 settings->setShouldRespectImageOrientation( | 1040 settings->setShouldRespectImageOrientation( |
| 1041 prefs.should_respect_image_orientation); | 1041 prefs.should_respect_image_orientation); |
| 1042 | 1042 |
| 1043 settings->setUnsafePluginPastingEnabled(false); | 1043 settings->setUnsafePluginPastingEnabled(false); |
| 1044 settings->setEditingBehavior( | 1044 settings->setEditingBehavior( |
| 1045 static_cast<WebSettings::EditingBehavior>(prefs.editing_behavior)); | 1045 static_cast<WebSettings::EditingBehavior>(prefs.editing_behavior)); |
| 1046 | 1046 |
| 1047 settings->setSupportsMultipleWindows(prefs.supports_multiple_windows); | 1047 settings->setSupportsMultipleWindows(prefs.supports_multiple_windows); |
| 1048 | 1048 |
| 1049 settings->setInertVisualViewport(prefs.inert_visual_viewport); | |
| 1050 | |
| 1051 // TODO(bokan): Remove once Blink side is gone. | 1049 // TODO(bokan): Remove once Blink side is gone. |
| 1052 settings->setInvertViewportScrollOrder(true); | 1050 settings->setInvertViewportScrollOrder(true); |
| 1053 | 1051 |
| 1054 settings->setSmartInsertDeleteEnabled(prefs.smart_insert_delete_enabled); | 1052 settings->setSmartInsertDeleteEnabled(prefs.smart_insert_delete_enabled); |
| 1055 | 1053 |
| 1056 settings->setSpatialNavigationEnabled(prefs.spatial_navigation_enabled); | 1054 settings->setSpatialNavigationEnabled(prefs.spatial_navigation_enabled); |
| 1057 | 1055 |
| 1058 settings->setSelectionIncludesAltImageText(true); | 1056 settings->setSelectionIncludesAltImageText(true); |
| 1059 | 1057 |
| 1060 settings->setV8CacheOptions( | 1058 settings->setV8CacheOptions( |
| (...skipping 2624 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 3685 std::vector<gfx::Size> sizes; | 3683 std::vector<gfx::Size> sizes; |
| 3686 ConvertToFaviconSizes(icon_urls[i].sizes(), &sizes); | 3684 ConvertToFaviconSizes(icon_urls[i].sizes(), &sizes); |
| 3687 if (!url.isEmpty()) | 3685 if (!url.isEmpty()) |
| 3688 urls.push_back( | 3686 urls.push_back( |
| 3689 FaviconURL(url, ToFaviconType(icon_urls[i].iconType()), sizes)); | 3687 FaviconURL(url, ToFaviconType(icon_urls[i].iconType()), sizes)); |
| 3690 } | 3688 } |
| 3691 SendUpdateFaviconURL(urls); | 3689 SendUpdateFaviconURL(urls); |
| 3692 } | 3690 } |
| 3693 | 3691 |
| 3694 } // namespace content | 3692 } // namespace content |
| OLD | NEW |