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