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 1122 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
1133 WebNetworkStateNotifier::setWebConnectionType( | 1133 WebNetworkStateNotifier::setWebConnectionType( |
1134 NetConnectionTypeToWebConnectionType(prefs.connection_type)); | 1134 NetConnectionTypeToWebConnectionType(prefs.connection_type)); |
1135 settings->setPinchVirtualViewportEnabled( | 1135 settings->setPinchVirtualViewportEnabled( |
1136 prefs.pinch_virtual_viewport_enabled); | 1136 prefs.pinch_virtual_viewport_enabled); |
1137 | 1137 |
1138 settings->setPinchOverlayScrollbarThickness( | 1138 settings->setPinchOverlayScrollbarThickness( |
1139 prefs.pinch_overlay_scrollbar_thickness); | 1139 prefs.pinch_overlay_scrollbar_thickness); |
1140 settings->setRubberBandingOnCompositorThread( | 1140 settings->setRubberBandingOnCompositorThread( |
1141 prefs.rubber_banding_on_compositor_thread); | 1141 prefs.rubber_banding_on_compositor_thread); |
1142 settings->setUseSolidColorScrollbars(prefs.use_solid_color_scrollbars); | 1142 settings->setUseSolidColorScrollbars(prefs.use_solid_color_scrollbars); |
| 1143 |
| 1144 #if defined(OS_WIN) |
| 1145 settings->setShowContextMenuOnMouseUp(true); |
| 1146 #endif |
1143 } | 1147 } |
1144 | 1148 |
1145 /*static*/ | 1149 /*static*/ |
1146 RenderViewImpl* RenderViewImpl::Create( | 1150 RenderViewImpl* RenderViewImpl::Create( |
1147 const ViewMsg_New_Params& params, | 1151 const ViewMsg_New_Params& params, |
1148 bool was_created_by_renderer) { | 1152 bool was_created_by_renderer) { |
1149 DCHECK(params.view_id != MSG_ROUTING_NONE); | 1153 DCHECK(params.view_id != MSG_ROUTING_NONE); |
1150 RenderViewImpl* render_view = NULL; | 1154 RenderViewImpl* render_view = NULL; |
1151 if (g_create_render_view_impl) | 1155 if (g_create_render_view_impl) |
1152 render_view = g_create_render_view_impl(params); | 1156 render_view = g_create_render_view_impl(params); |
(...skipping 3043 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
4196 std::vector<gfx::Size> sizes; | 4200 std::vector<gfx::Size> sizes; |
4197 ConvertToFaviconSizes(icon_urls[i].sizes(), &sizes); | 4201 ConvertToFaviconSizes(icon_urls[i].sizes(), &sizes); |
4198 if (!url.isEmpty()) | 4202 if (!url.isEmpty()) |
4199 urls.push_back( | 4203 urls.push_back( |
4200 FaviconURL(url, ToFaviconType(icon_urls[i].iconType()), sizes)); | 4204 FaviconURL(url, ToFaviconType(icon_urls[i].iconType()), sizes)); |
4201 } | 4205 } |
4202 SendUpdateFaviconURL(urls); | 4206 SendUpdateFaviconURL(urls); |
4203 } | 4207 } |
4204 | 4208 |
4205 } // namespace content | 4209 } // namespace content |
OLD | NEW |