| OLD | NEW |
| 1 // Copyright (c) 2011 The Chromium Authors. All rights reserved. | 1 // Copyright (c) 2011 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 "views/widget/root_view.h" | 5 #include "views/widget/root_view.h" |
| 6 | 6 |
| 7 #include <algorithm> | 7 #include <algorithm> |
| 8 | 8 |
| 9 #if defined(TOUCH_UI) && defined(HAVE_XINPUT2) | 9 #if defined(TOUCH_UI) && defined(HAVE_XINPUT2) |
| 10 #include <gdk/gdkx.h> | 10 #include <gdk/gdkx.h> |
| 11 #endif | 11 #endif |
| 12 | 12 |
| 13 #include "base/logging.h" | 13 #include "base/logging.h" |
| 14 #include "base/message_loop.h" | 14 #include "base/message_loop.h" |
| 15 #include "gfx/canvas_skia.h" | |
| 16 #include "ui/base/dragdrop/drag_drop_types.h" | 15 #include "ui/base/dragdrop/drag_drop_types.h" |
| 17 #include "ui/base/keycodes/keyboard_codes.h" | 16 #include "ui/base/keycodes/keyboard_codes.h" |
| 17 #include "ui/gfx/canvas_skia.h" |
| 18 #include "views/focus/view_storage.h" | 18 #include "views/focus/view_storage.h" |
| 19 #include "views/layout/fill_layout.h" | 19 #include "views/layout/fill_layout.h" |
| 20 #include "views/widget/widget.h" | 20 #include "views/widget/widget.h" |
| 21 #include "views/window/window.h" | 21 #include "views/window/window.h" |
| 22 | 22 |
| 23 #if defined(TOUCH_UI) | 23 #if defined(TOUCH_UI) |
| 24 #include "views/touchui/gesture_manager.h" | 24 #include "views/touchui/gesture_manager.h" |
| 25 #if defined(HAVE_XINPUT2) | 25 #if defined(HAVE_XINPUT2) |
| 26 #include "gfx/gtk_util.h" | 26 #include "ui/gfx/gtk_util.h" |
| 27 #include "views/touchui/touch_factory.h" | 27 #include "views/touchui/touch_factory.h" |
| 28 #endif | 28 #endif |
| 29 #endif | 29 #endif |
| 30 | 30 |
| 31 #if defined(OS_LINUX) | 31 #if defined(OS_LINUX) |
| 32 #include "views/widget/widget_gtk.h" | 32 #include "views/widget/widget_gtk.h" |
| 33 #include "views/controls/textfield/native_textfield_views.h" | 33 #include "views/controls/textfield/native_textfield_views.h" |
| 34 #endif // defined(OS_LINUX) | 34 #endif // defined(OS_LINUX) |
| 35 | 35 |
| 36 namespace views { | 36 namespace views { |
| (...skipping 770 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 807 if (!TouchFactory::GetInstance()->is_cursor_visible()) { | 807 if (!TouchFactory::GetInstance()->is_cursor_visible()) { |
| 808 cursor = gfx::GetCursor(GDK_BLANK_CURSOR); | 808 cursor = gfx::GetCursor(GDK_BLANK_CURSOR); |
| 809 } | 809 } |
| 810 #endif | 810 #endif |
| 811 | 811 |
| 812 gdk_window_set_cursor(native_view->window, cursor); | 812 gdk_window_set_cursor(native_view->window, cursor); |
| 813 #endif | 813 #endif |
| 814 } | 814 } |
| 815 | 815 |
| 816 } // namespace views | 816 } // namespace views |
| OLD | NEW |