Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(294)

Side by Side Diff: content/renderer/render_view_impl.cc

Issue 819293002: Set whether context menu appears on mouse up from WebPreferences (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Fix order to be like WebPreferences Created 5 years, 9 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch
« no previous file with comments | « content/public/common/web_preferences.cc ('k') | no next file » | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
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 1113 matching lines...) Expand 10 before | Expand all | Expand 10 after
1124 NetConnectionTypeToWebConnectionType(prefs.connection_type)); 1124 NetConnectionTypeToWebConnectionType(prefs.connection_type));
1125 settings->setPinchVirtualViewportEnabled( 1125 settings->setPinchVirtualViewportEnabled(
1126 prefs.pinch_virtual_viewport_enabled); 1126 prefs.pinch_virtual_viewport_enabled);
1127 1127
1128 settings->setPinchOverlayScrollbarThickness( 1128 settings->setPinchOverlayScrollbarThickness(
1129 prefs.pinch_overlay_scrollbar_thickness); 1129 prefs.pinch_overlay_scrollbar_thickness);
1130 settings->setRubberBandingOnCompositorThread( 1130 settings->setRubberBandingOnCompositorThread(
1131 prefs.rubber_banding_on_compositor_thread); 1131 prefs.rubber_banding_on_compositor_thread);
1132 settings->setUseSolidColorScrollbars(prefs.use_solid_color_scrollbars); 1132 settings->setUseSolidColorScrollbars(prefs.use_solid_color_scrollbars);
1133 1133
1134 #if defined(OS_WIN) 1134 settings->setShowContextMenuOnMouseUp(prefs.context_menu_on_mouse_up);
1135 settings->setShowContextMenuOnMouseUp(true);
1136 #endif
1137 1135
1138 #if defined(OS_MACOSX) 1136 #if defined(OS_MACOSX)
1139 settings->setDoubleTapToZoomEnabled(true); 1137 settings->setDoubleTapToZoomEnabled(true);
1140 web_view->setMaximumLegibleScale(prefs.default_maximum_page_scale_factor); 1138 web_view->setMaximumLegibleScale(prefs.default_maximum_page_scale_factor);
1141 #endif 1139 #endif
1142 } 1140 }
1143 1141
1144 /*static*/ 1142 /*static*/
1145 RenderViewImpl* RenderViewImpl::Create(const ViewMsg_New_Params& params, 1143 RenderViewImpl* RenderViewImpl::Create(const ViewMsg_New_Params& params,
1146 CompositorDependencies* compositor_deps, 1144 CompositorDependencies* compositor_deps,
(...skipping 2915 matching lines...) Expand 10 before | Expand all | Expand 10 after
4062 std::vector<gfx::Size> sizes; 4060 std::vector<gfx::Size> sizes;
4063 ConvertToFaviconSizes(icon_urls[i].sizes(), &sizes); 4061 ConvertToFaviconSizes(icon_urls[i].sizes(), &sizes);
4064 if (!url.isEmpty()) 4062 if (!url.isEmpty())
4065 urls.push_back( 4063 urls.push_back(
4066 FaviconURL(url, ToFaviconType(icon_urls[i].iconType()), sizes)); 4064 FaviconURL(url, ToFaviconType(icon_urls[i].iconType()), sizes));
4067 } 4065 }
4068 SendUpdateFaviconURL(urls); 4066 SendUpdateFaviconURL(urls);
4069 } 4067 }
4070 4068
4071 } // namespace content 4069 } // namespace content
OLDNEW
« no previous file with comments | « content/public/common/web_preferences.cc ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698