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 450 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
461 #if defined(OS_ANDROID) | 461 #if defined(OS_ANDROID) |
462 prefs.device_supports_mouse = false; | 462 prefs.device_supports_mouse = false; |
463 #endif | 463 #endif |
464 | 464 |
465 prefs.pointer_events_max_touch_points = ui::MaxTouchPoints(); | 465 prefs.pointer_events_max_touch_points = ui::MaxTouchPoints(); |
466 | 466 |
467 prefs.touch_adjustment_enabled = | 467 prefs.touch_adjustment_enabled = |
468 !command_line.HasSwitch(switches::kDisableTouchAdjustment); | 468 !command_line.HasSwitch(switches::kDisableTouchAdjustment); |
469 | 469 |
470 prefs.slimming_paint_enabled = command_line.HasSwitch( | 470 prefs.slimming_paint_enabled = command_line.HasSwitch( |
471 switches::kEnableSlimmingPaint); | 471 switches::kEnableSlimmingPaint) || |
| 472 !command_line.HasSwitch(switches::kDisableSlimmingPaint); |
472 | 473 |
473 #if defined(OS_MACOSX) || defined(OS_CHROMEOS) | 474 #if defined(OS_MACOSX) || defined(OS_CHROMEOS) |
474 bool default_enable_scroll_animator = true; | 475 bool default_enable_scroll_animator = true; |
475 #else | 476 #else |
476 bool default_enable_scroll_animator = false; | 477 bool default_enable_scroll_animator = false; |
477 #endif | 478 #endif |
478 prefs.enable_scroll_animator = default_enable_scroll_animator; | 479 prefs.enable_scroll_animator = default_enable_scroll_animator; |
479 if (command_line.HasSwitch(switches::kEnableSmoothScrolling)) | 480 if (command_line.HasSwitch(switches::kEnableSmoothScrolling)) |
480 prefs.enable_scroll_animator = true; | 481 prefs.enable_scroll_animator = true; |
481 if (command_line.HasSwitch(switches::kDisableSmoothScrolling)) | 482 if (command_line.HasSwitch(switches::kDisableSmoothScrolling)) |
(...skipping 945 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
1427 if (!policy->CanReadFile(GetProcess()->GetID(), file)) | 1428 if (!policy->CanReadFile(GetProcess()->GetID(), file)) |
1428 policy->GrantReadFile(GetProcess()->GetID(), file); | 1429 policy->GrantReadFile(GetProcess()->GetID(), file); |
1429 } | 1430 } |
1430 } | 1431 } |
1431 | 1432 |
1432 void RenderViewHostImpl::SelectWordAroundCaret() { | 1433 void RenderViewHostImpl::SelectWordAroundCaret() { |
1433 Send(new ViewMsg_SelectWordAroundCaret(GetRoutingID())); | 1434 Send(new ViewMsg_SelectWordAroundCaret(GetRoutingID())); |
1434 } | 1435 } |
1435 | 1436 |
1436 } // namespace content | 1437 } // namespace content |
OLD | NEW |