| 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 #include <memory> | 9 #include <memory> |
| 10 | 10 |
| (...skipping 1130 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 1141 | 1141 |
| 1142 settings->setLoadWithOverviewMode(prefs.initialize_at_minimum_page_scale); | 1142 settings->setLoadWithOverviewMode(prefs.initialize_at_minimum_page_scale); |
| 1143 settings->setMainFrameResizesAreOrientationChanges( | 1143 settings->setMainFrameResizesAreOrientationChanges( |
| 1144 prefs.main_frame_resizes_are_orientation_changes); | 1144 prefs.main_frame_resizes_are_orientation_changes); |
| 1145 | 1145 |
| 1146 settings->setPinchOverlayScrollbarThickness( | 1146 settings->setPinchOverlayScrollbarThickness( |
| 1147 prefs.pinch_overlay_scrollbar_thickness); | 1147 prefs.pinch_overlay_scrollbar_thickness); |
| 1148 settings->setUseSolidColorScrollbars(prefs.use_solid_color_scrollbars); | 1148 settings->setUseSolidColorScrollbars(prefs.use_solid_color_scrollbars); |
| 1149 | 1149 |
| 1150 settings->setShowContextMenuOnMouseUp(prefs.context_menu_on_mouse_up); | 1150 settings->setShowContextMenuOnMouseUp(prefs.context_menu_on_mouse_up); |
| 1151 settings->setAlwaysShowContextMenuOnTouch( |
| 1152 prefs.always_show_context_menu_on_touch); |
| 1151 | 1153 |
| 1152 #if defined(OS_MACOSX) | 1154 #if defined(OS_MACOSX) |
| 1153 settings->setDoubleTapToZoomEnabled(true); | 1155 settings->setDoubleTapToZoomEnabled(true); |
| 1154 web_view->setMaximumLegibleScale(prefs.default_maximum_page_scale_factor); | 1156 web_view->setMaximumLegibleScale(prefs.default_maximum_page_scale_factor); |
| 1155 #endif | 1157 #endif |
| 1156 | 1158 |
| 1157 settings->setWheelGesturesEnabled(UseGestureBasedWheelScrolling()); | 1159 settings->setWheelGesturesEnabled(UseGestureBasedWheelScrolling()); |
| 1158 } | 1160 } |
| 1159 | 1161 |
| 1160 /*static*/ | 1162 /*static*/ |
| (...skipping 2230 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 3391 return render_frame->focused_pepper_plugin(); | 3393 return render_frame->focused_pepper_plugin(); |
| 3392 } | 3394 } |
| 3393 frame = frame->traverseNext(false); | 3395 frame = frame->traverseNext(false); |
| 3394 } | 3396 } |
| 3395 | 3397 |
| 3396 return nullptr; | 3398 return nullptr; |
| 3397 } | 3399 } |
| 3398 #endif | 3400 #endif |
| 3399 | 3401 |
| 3400 } // namespace content | 3402 } // namespace content |
| OLD | NEW |