Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(607)

Side by Side Diff: ui/views/widget/desktop_aura/desktop_window_tree_host_x11.cc

Issue 289283015: Extract touchscreen device management into a generic manager (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Rebased Created 6 years, 6 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch | Annotate | Revision Log
OLDNEW
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/views/widget/desktop_aura/desktop_window_tree_host_x11.h" 5 #include "ui/views/widget/desktop_aura/desktop_window_tree_host_x11.h"
6 6
7 #include <X11/extensions/shape.h> 7 #include <X11/extensions/shape.h>
8 #include <X11/extensions/XInput2.h> 8 #include <X11/extensions/XInput2.h>
9 #include <X11/Xatom.h> 9 #include <X11/Xatom.h>
10 #include <X11/Xregion.h> 10 #include <X11/Xregion.h>
11 #include <X11/Xutil.h> 11 #include <X11/Xutil.h>
12 12
13 #include "base/basictypes.h" 13 #include "base/basictypes.h"
14 #include "base/command_line.h" 14 #include "base/command_line.h"
15 #include "base/debug/trace_event.h" 15 #include "base/debug/trace_event.h"
16 #include "base/strings/stringprintf.h" 16 #include "base/strings/stringprintf.h"
17 #include "base/strings/utf_string_conversions.h" 17 #include "base/strings/utf_string_conversions.h"
18 #include "third_party/skia/include/core/SkPath.h" 18 #include "third_party/skia/include/core/SkPath.h"
19 #include "ui/aura/client/cursor_client.h" 19 #include "ui/aura/client/cursor_client.h"
20 #include "ui/aura/client/focus_client.h" 20 #include "ui/aura/client/focus_client.h"
21 #include "ui/aura/window.h" 21 #include "ui/aura/window.h"
22 #include "ui/aura/window_event_dispatcher.h" 22 #include "ui/aura/window_event_dispatcher.h"
23 #include "ui/aura/window_property.h" 23 #include "ui/aura/window_property.h"
24 #include "ui/base/dragdrop/os_exchange_data_provider_aurax11.h" 24 #include "ui/base/dragdrop/os_exchange_data_provider_aurax11.h"
25 #include "ui/base/hit_test.h" 25 #include "ui/base/hit_test.h"
26 #include "ui/base/x/x11_util.h" 26 #include "ui/base/x/x11_util.h"
27 #include "ui/events/event_utils.h" 27 #include "ui/events/event_utils.h"
28 #include "ui/events/platform/platform_event_source.h" 28 #include "ui/events/platform/platform_event_source.h"
29 #include "ui/events/platform/x11/x11_event_source.h" 29 #include "ui/events/platform/x11/x11_event_source.h"
30 #include "ui/events/x/device_data_manager.h" 30 #include "ui/events/x/device_data_manager_x11.h"
31 #include "ui/events/x/device_list_cache_x.h" 31 #include "ui/events/x/device_list_cache_x.h"
32 #include "ui/events/x/touch_factory_x11.h" 32 #include "ui/events/x/touch_factory_x11.h"
33 #include "ui/gfx/image/image_skia.h" 33 #include "ui/gfx/image/image_skia.h"
34 #include "ui/gfx/image/image_skia_rep.h" 34 #include "ui/gfx/image/image_skia_rep.h"
35 #include "ui/gfx/insets.h" 35 #include "ui/gfx/insets.h"
36 #include "ui/gfx/path.h" 36 #include "ui/gfx/path.h"
37 #include "ui/gfx/path_x11.h" 37 #include "ui/gfx/path_x11.h"
38 #include "ui/gfx/screen.h" 38 #include "ui/gfx/screen.h"
39 #include "ui/native_theme/native_theme.h" 39 #include "ui/native_theme/native_theme.h"
40 #include "ui/views/corewm/tooltip_aura.h" 40 #include "ui/views/corewm/tooltip_aura.h"
(...skipping 1657 matching lines...) Expand 10 before | Expand all | Expand 10 after
1698 } 1698 }
1699 break; 1699 break;
1700 } 1700 }
1701 case MappingNotify: { 1701 case MappingNotify: {
1702 switch (xev->xmapping.request) { 1702 switch (xev->xmapping.request) {
1703 case MappingModifier: 1703 case MappingModifier:
1704 case MappingKeyboard: 1704 case MappingKeyboard:
1705 XRefreshKeyboardMapping(&xev->xmapping); 1705 XRefreshKeyboardMapping(&xev->xmapping);
1706 break; 1706 break;
1707 case MappingPointer: 1707 case MappingPointer:
1708 ui::DeviceDataManager::GetInstance()->UpdateButtonMap(); 1708 ui::DeviceDataManagerX11::GetInstance()->UpdateButtonMap();
1709 break; 1709 break;
1710 default: 1710 default:
1711 NOTIMPLEMENTED() << " Unknown request: " << xev->xmapping.request; 1711 NOTIMPLEMENTED() << " Unknown request: " << xev->xmapping.request;
1712 break; 1712 break;
1713 } 1713 }
1714 break; 1714 break;
1715 } 1715 }
1716 case MotionNotify: { 1716 case MotionNotify: {
1717 // Discard all but the most recent motion event that targets the same 1717 // Discard all but the most recent motion event that targets the same
1718 // window with unchanged state. 1718 // window with unchanged state.
(...skipping 49 matching lines...) Expand 10 before | Expand all | Expand 10 after
1768 if (linux_ui) { 1768 if (linux_ui) {
1769 ui::NativeTheme* native_theme = linux_ui->GetNativeTheme(window); 1769 ui::NativeTheme* native_theme = linux_ui->GetNativeTheme(window);
1770 if (native_theme) 1770 if (native_theme)
1771 return native_theme; 1771 return native_theme;
1772 } 1772 }
1773 1773
1774 return ui::NativeTheme::instance(); 1774 return ui::NativeTheme::instance();
1775 } 1775 }
1776 1776
1777 } // namespace views 1777 } // namespace views
OLDNEW
« ui/events/x/device_data_manager_x11.h ('K') | « ui/views/test/views_test_base.h ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698