| 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 "ui/base/touch/touch_factory.h" | 5 #include "ui/base/touch/touch_factory.h" |
| 6 | 6 |
| 7 #include <X11/cursorfont.h> | 7 #include <X11/cursorfont.h> |
| 8 #include <X11/extensions/XInput.h> | 8 #include <X11/extensions/XInput.h> |
| 9 #include <X11/extensions/XInput2.h> | 9 #include <X11/extensions/XInput2.h> |
| 10 #include <X11/extensions/XIproto.h> | 10 #include <X11/extensions/XIproto.h> |
| 11 | 11 |
| 12 #include "base/basictypes.h" | 12 #include "base/basictypes.h" |
| 13 #include "base/command_line.h" | 13 #include "base/command_line.h" |
| 14 #include "base/compiler_specific.h" | 14 #include "base/compiler_specific.h" |
| 15 #include "base/logging.h" | 15 #include "base/logging.h" |
| 16 #include "base/memory/singleton.h" |
| 16 #include "base/message_loop.h" | 17 #include "base/message_loop.h" |
| 17 #include "base/string_number_conversions.h" | 18 #include "base/string_number_conversions.h" |
| 18 #include "base/string_split.h" | 19 #include "base/string_split.h" |
| 19 #include "ui/base/ui_base_switches.h" | 20 #include "ui/base/ui_base_switches.h" |
| 20 #include "ui/base/x/x11_util.h" | 21 #include "ui/base/x/x11_util.h" |
| 21 | 22 |
| 22 namespace { | 23 namespace { |
| 23 | 24 |
| 24 // The X cursor is hidden if it is idle for kCursorIdleSeconds seconds. | 25 // The X cursor is hidden if it is idle for kCursorIdleSeconds seconds. |
| 25 int kCursorIdleSeconds = 5; | 26 int kCursorIdleSeconds = 5; |
| (...skipping 387 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 413 else if (touch_device_available_) | 414 else if (touch_device_available_) |
| 414 XDefineCursor(display, window, invisible_cursor_); | 415 XDefineCursor(display, window, invisible_cursor_); |
| 415 } | 416 } |
| 416 | 417 |
| 417 bool TouchFactory::IsTouchDevicePresent() { | 418 bool TouchFactory::IsTouchDevicePresent() { |
| 418 touch_present_called_ = true; | 419 touch_present_called_ = true; |
| 419 return (touch_device_available_ && touch_events_allowed_); | 420 return (touch_device_available_ && touch_events_allowed_); |
| 420 } | 421 } |
| 421 | 422 |
| 422 } // namespace ui | 423 } // namespace ui |
| OLD | NEW |