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 #if defined(OS_ANDROID) | 462 #if defined(OS_ANDROID) |
463 prefs.device_supports_mouse = false; | 463 prefs.device_supports_mouse = false; |
464 #endif | 464 #endif |
465 | 465 |
466 prefs.pointer_events_max_touch_points = ui::MaxTouchPoints(); | 466 prefs.pointer_events_max_touch_points = ui::MaxTouchPoints(); |
467 | 467 |
468 prefs.touch_adjustment_enabled = | 468 prefs.touch_adjustment_enabled = |
469 !command_line.HasSwitch(switches::kDisableTouchAdjustment); | 469 !command_line.HasSwitch(switches::kDisableTouchAdjustment); |
470 | 470 |
471 prefs.slimming_paint_enabled = command_line.HasSwitch( | 471 prefs.slimming_paint_enabled = command_line.HasSwitch( |
472 switches::kEnableSlimmingPaint) || | 472 switches::kEnableSlimmingPaint); |
chrishtr
2015/06/12 20:18:09
switches::kDisableSlimmingPaint || !switches::kEna
wkorman
2015/06/12 20:20:17
We want it enabled if the enable switch is not set
chrishtr
2015/06/12 20:24:24
Oh right..then:
switches::kEnableSlimmingPaint &&
| |
473 !command_line.HasSwitch(switches::kDisableSlimmingPaint); | |
474 | 473 |
475 #if defined(OS_MACOSX) || defined(OS_CHROMEOS) | 474 #if defined(OS_MACOSX) || defined(OS_CHROMEOS) |
476 bool default_enable_scroll_animator = true; | 475 bool default_enable_scroll_animator = true; |
477 #else | 476 #else |
478 bool default_enable_scroll_animator = false; | 477 bool default_enable_scroll_animator = false; |
479 #endif | 478 #endif |
480 prefs.enable_scroll_animator = default_enable_scroll_animator; | 479 prefs.enable_scroll_animator = default_enable_scroll_animator; |
481 if (command_line.HasSwitch(switches::kEnableSmoothScrolling)) | 480 if (command_line.HasSwitch(switches::kEnableSmoothScrolling)) |
482 prefs.enable_scroll_animator = true; | 481 prefs.enable_scroll_animator = true; |
483 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... | |
1429 if (!policy->CanReadFile(GetProcess()->GetID(), file)) | 1428 if (!policy->CanReadFile(GetProcess()->GetID(), file)) |
1430 policy->GrantReadFile(GetProcess()->GetID(), file); | 1429 policy->GrantReadFile(GetProcess()->GetID(), file); |
1431 } | 1430 } |
1432 } | 1431 } |
1433 | 1432 |
1434 void RenderViewHostImpl::SelectWordAroundCaret() { | 1433 void RenderViewHostImpl::SelectWordAroundCaret() { |
1435 Send(new ViewMsg_SelectWordAroundCaret(GetRoutingID())); | 1434 Send(new ViewMsg_SelectWordAroundCaret(GetRoutingID())); |
1436 } | 1435 } |
1437 | 1436 |
1438 } // namespace content | 1437 } // namespace content |
OLD | NEW |