| 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 411 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 422 prefs.device_supports_touch = prefs.touch_enabled && | 422 prefs.device_supports_touch = prefs.touch_enabled && |
| 423 ui::IsTouchDevicePresent(); | 423 ui::IsTouchDevicePresent(); |
| 424 #if defined(OS_ANDROID) | 424 #if defined(OS_ANDROID) |
| 425 prefs.device_supports_mouse = false; | 425 prefs.device_supports_mouse = false; |
| 426 #endif | 426 #endif |
| 427 | 427 |
| 428 prefs.pointer_events_max_touch_points = ui::MaxTouchPoints(); | 428 prefs.pointer_events_max_touch_points = ui::MaxTouchPoints(); |
| 429 | 429 |
| 430 prefs.touch_adjustment_enabled = | 430 prefs.touch_adjustment_enabled = |
| 431 !command_line.HasSwitch(switches::kDisableTouchAdjustment); | 431 !command_line.HasSwitch(switches::kDisableTouchAdjustment); |
| 432 prefs.compositor_touch_hit_testing = | |
| 433 !command_line.HasSwitch(cc::switches::kDisableCompositorTouchHitTesting); | |
| 434 | 432 |
| 435 #if defined(OS_MACOSX) || defined(OS_CHROMEOS) | 433 #if defined(OS_MACOSX) || defined(OS_CHROMEOS) |
| 436 bool default_enable_scroll_animator = true; | 434 bool default_enable_scroll_animator = true; |
| 437 #else | 435 #else |
| 438 bool default_enable_scroll_animator = false; | 436 bool default_enable_scroll_animator = false; |
| 439 #endif | 437 #endif |
| 440 prefs.enable_scroll_animator = default_enable_scroll_animator; | 438 prefs.enable_scroll_animator = default_enable_scroll_animator; |
| 441 if (command_line.HasSwitch(switches::kEnableSmoothScrolling)) | 439 if (command_line.HasSwitch(switches::kEnableSmoothScrolling)) |
| 442 prefs.enable_scroll_animator = true; | 440 prefs.enable_scroll_animator = true; |
| 443 if (command_line.HasSwitch(switches::kDisableSmoothScrolling)) | 441 if (command_line.HasSwitch(switches::kDisableSmoothScrolling)) |
| (...skipping 1138 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 1582 FrameTree* frame_tree = delegate_->GetFrameTree(); | 1580 FrameTree* frame_tree = delegate_->GetFrameTree(); |
| 1583 | 1581 |
| 1584 frame_tree->ResetForMainFrameSwap(); | 1582 frame_tree->ResetForMainFrameSwap(); |
| 1585 } | 1583 } |
| 1586 | 1584 |
| 1587 void RenderViewHostImpl::SelectWordAroundCaret() { | 1585 void RenderViewHostImpl::SelectWordAroundCaret() { |
| 1588 Send(new ViewMsg_SelectWordAroundCaret(GetRoutingID())); | 1586 Send(new ViewMsg_SelectWordAroundCaret(GetRoutingID())); |
| 1589 } | 1587 } |
| 1590 | 1588 |
| 1591 } // namespace content | 1589 } // namespace content |
| OLD | NEW |