Chromium Code Reviews| Index: ui/events/event_utils.cc |
| diff --git a/ui/events/event_utils.cc b/ui/events/event_utils.cc |
| index 8a3ba6699fedc37c674b88f900a9286aedceac50..8056c0c09775f19594995a82c4bf6e57d9f1820f 100644 |
| --- a/ui/events/event_utils.cc |
| +++ b/ui/events/event_utils.cc |
| @@ -26,18 +26,20 @@ base::TimeDelta EventTimeForNow() { |
| } |
| bool ShouldDefaultToNaturalScroll() { |
| + return InternalDisplaySupportsTouch() == |
| + gfx::Display::TOUCH_SUPPORT_AVAILABLE; |
| +} |
| + |
| +gfx::Display::TouchSupport InternalDisplaySupportsTouch() { |
|
oshima
2014/01/17 20:49:47
GetInternalDisplayTouchSupport() ?
tdresser
2014/01/17 21:34:54
Done.
|
| gfx::Screen* screen = gfx::Screen::GetScreenByType(gfx::SCREEN_TYPE_NATIVE); |
| - if (!screen) |
| - return false; |
| + CHECK(screen); |
| const std::vector<gfx::Display>& displays = screen->GetAllDisplays(); |
| for (std::vector<gfx::Display>::const_iterator it = displays.begin(); |
| it != displays.end(); ++it) { |
| - const gfx::Display& display = *it; |
| - if (display.IsInternal() && |
| - display.touch_support() == gfx::Display::TOUCH_SUPPORT_AVAILABLE) |
| - return true; |
| + if (it->IsInternal()) |
| + return it->touch_support(); |
| } |
| - return false; |
| + return gfx::Display::TOUCH_SUPPORT_UNAVAILABLE; |
| } |
| } // namespace ui |