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/browser/renderer_host/render_view_host_impl.h" | 5 #include "content/browser/renderer_host/render_view_host_impl.h" |
6 | 6 |
7 #include <set> | 7 #include <set> |
8 #include <string> | 8 #include <string> |
9 #include <utility> | 9 #include <utility> |
10 #include <vector> | 10 #include <vector> |
(...skipping 395 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
406 command_line.HasSwitch(switches::kEnableContainerCulling); | 406 command_line.HasSwitch(switches::kEnableContainerCulling); |
407 prefs.region_based_columns_enabled = | 407 prefs.region_based_columns_enabled = |
408 command_line.HasSwitch(switches::kEnableRegionBasedColumns); | 408 command_line.HasSwitch(switches::kEnableRegionBasedColumns); |
409 | 409 |
410 if (IsPinchVirtualViewportEnabled()) { | 410 if (IsPinchVirtualViewportEnabled()) { |
411 prefs.pinch_virtual_viewport_enabled = true; | 411 prefs.pinch_virtual_viewport_enabled = true; |
412 prefs.pinch_overlay_scrollbar_thickness = 10; | 412 prefs.pinch_overlay_scrollbar_thickness = 10; |
413 } | 413 } |
414 prefs.use_solid_color_scrollbars = ui::IsOverlayScrollbarEnabled(); | 414 prefs.use_solid_color_scrollbars = ui::IsOverlayScrollbarEnabled(); |
415 | 415 |
| 416 #if defined(OS_ANDROID) |
| 417 prefs.user_gesture_required_for_media_playback = !command_line.HasSwitch( |
| 418 switches::kDisableGestureRequirementForMediaPlayback); |
| 419 #endif |
| 420 |
416 prefs.touch_enabled = ui::AreTouchEventsEnabled(); | 421 prefs.touch_enabled = ui::AreTouchEventsEnabled(); |
417 prefs.device_supports_touch = prefs.touch_enabled && | 422 prefs.device_supports_touch = prefs.touch_enabled && |
418 ui::IsTouchDevicePresent(); | 423 ui::IsTouchDevicePresent(); |
419 #if defined(OS_ANDROID) | 424 #if defined(OS_ANDROID) |
420 prefs.device_supports_mouse = false; | 425 prefs.device_supports_mouse = false; |
421 #endif | 426 #endif |
422 | 427 |
423 prefs.pointer_events_max_touch_points = ui::MaxTouchPoints(); | 428 prefs.pointer_events_max_touch_points = ui::MaxTouchPoints(); |
424 | 429 |
425 prefs.touch_adjustment_enabled = | 430 prefs.touch_adjustment_enabled = |
(...skipping 1151 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
1577 FrameTree* frame_tree = delegate_->GetFrameTree(); | 1582 FrameTree* frame_tree = delegate_->GetFrameTree(); |
1578 | 1583 |
1579 frame_tree->ResetForMainFrameSwap(); | 1584 frame_tree->ResetForMainFrameSwap(); |
1580 } | 1585 } |
1581 | 1586 |
1582 void RenderViewHostImpl::SelectWordAroundCaret() { | 1587 void RenderViewHostImpl::SelectWordAroundCaret() { |
1583 Send(new ViewMsg_SelectWordAroundCaret(GetRoutingID())); | 1588 Send(new ViewMsg_SelectWordAroundCaret(GetRoutingID())); |
1584 } | 1589 } |
1585 | 1590 |
1586 } // namespace content | 1591 } // namespace content |
OLD | NEW |