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 397 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
408 ui::IsTouchDevicePresent(); | 408 ui::IsTouchDevicePresent(); |
409 #if defined(OS_ANDROID) | 409 #if defined(OS_ANDROID) |
410 prefs.device_supports_mouse = false; | 410 prefs.device_supports_mouse = false; |
411 #endif | 411 #endif |
412 | 412 |
413 prefs.pointer_events_max_touch_points = ui::MaxTouchPoints(); | 413 prefs.pointer_events_max_touch_points = ui::MaxTouchPoints(); |
414 | 414 |
415 prefs.touch_adjustment_enabled = | 415 prefs.touch_adjustment_enabled = |
416 !command_line.HasSwitch(switches::kDisableTouchAdjustment); | 416 !command_line.HasSwitch(switches::kDisableTouchAdjustment); |
417 | 417 |
| 418 prefs.slimming_paint_enabled = |
| 419 command_line.HasSwitch(switches::kEnableSlimmingPaint); |
| 420 |
418 #if defined(OS_MACOSX) || defined(OS_CHROMEOS) | 421 #if defined(OS_MACOSX) || defined(OS_CHROMEOS) |
419 bool default_enable_scroll_animator = true; | 422 bool default_enable_scroll_animator = true; |
420 #else | 423 #else |
421 bool default_enable_scroll_animator = false; | 424 bool default_enable_scroll_animator = false; |
422 #endif | 425 #endif |
423 prefs.enable_scroll_animator = default_enable_scroll_animator; | 426 prefs.enable_scroll_animator = default_enable_scroll_animator; |
424 if (command_line.HasSwitch(switches::kEnableSmoothScrolling)) | 427 if (command_line.HasSwitch(switches::kEnableSmoothScrolling)) |
425 prefs.enable_scroll_animator = true; | 428 prefs.enable_scroll_animator = true; |
426 if (command_line.HasSwitch(switches::kDisableSmoothScrolling)) | 429 if (command_line.HasSwitch(switches::kDisableSmoothScrolling)) |
427 prefs.enable_scroll_animator = false; | 430 prefs.enable_scroll_animator = false; |
(...skipping 989 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
1417 FrameTree* frame_tree = delegate_->GetFrameTree(); | 1420 FrameTree* frame_tree = delegate_->GetFrameTree(); |
1418 | 1421 |
1419 frame_tree->ResetForMainFrameSwap(); | 1422 frame_tree->ResetForMainFrameSwap(); |
1420 } | 1423 } |
1421 | 1424 |
1422 void RenderViewHostImpl::SelectWordAroundCaret() { | 1425 void RenderViewHostImpl::SelectWordAroundCaret() { |
1423 Send(new ViewMsg_SelectWordAroundCaret(GetRoutingID())); | 1426 Send(new ViewMsg_SelectWordAroundCaret(GetRoutingID())); |
1424 } | 1427 } |
1425 | 1428 |
1426 } // namespace content | 1429 } // namespace content |
OLD | NEW |