ui/views/widget/desktop_aura/desktop_window_tree_host_x11.cc - Issue 685793002: Move all event related devices from ui/events/ to ui/events/devices/

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

Issue 685793002: Move all event related devices from ui/events/ to ui/events/devices/ (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@internal-touchscreens

Patch Set: fix ozone Created 6 years, 1 month 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

« no previous file with comments | « ui/views/views.gyp ('k') | ui/wm/BUILD.gn » ('j') | no next file with comments »

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/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/devices/x11/device_data_manager_x11.h"

	28 #include "ui/events/devices/x11/device_list_cache_x11.h"

	29 #include "ui/events/devices/x11/touch_factory_x11.h"

27 #include "ui/events/event_utils.h"	30 #include "ui/events/event_utils.h"

28 #include "ui/events/platform/platform_event_source.h"	31 #include "ui/events/platform/platform_event_source.h"

29 #include "ui/events/platform/x11/x11_event_source.h"	32 #include "ui/events/platform/x11/x11_event_source.h"

30 #include "ui/events/x/device_data_manager_x11.h"

31 #include "ui/events/x/device_list_cache_x.h"

32 #include "ui/events/x/touch_factory_x11.h"

33 #include "ui/gfx/display.h"	33 #include "ui/gfx/display.h"

34 #include "ui/gfx/image/image_skia.h"	34 #include "ui/gfx/image/image_skia.h"

35 #include "ui/gfx/image/image_skia_rep.h"	35 #include "ui/gfx/image/image_skia_rep.h"

36 #include "ui/gfx/insets.h"	36 #include "ui/gfx/insets.h"

37 #include "ui/gfx/path.h"	37 #include "ui/gfx/path.h"

38 #include "ui/gfx/path_x11.h"	38 #include "ui/gfx/path_x11.h"

39 #include "ui/gfx/screen.h"	39 #include "ui/gfx/screen.h"

40 #include "ui/native_theme/native_theme.h"	40 #include "ui/native_theme/native_theme.h"

41 #include "ui/views/corewm/tooltip_aura.h"	41 #include "ui/views/corewm/tooltip_aura.h"

42 #include "ui/views/ime/input_method.h"	42 #include "ui/views/ime/input_method.h"

(...skipping 1900 matching lines...) Expand 10 before \| Expand all \| Expand 10 after Loading...
1943 if (linux_ui) {	1943 if (linux_ui) {

1944 ui::NativeTheme* native_theme = linux_ui->GetNativeTheme(window);	1944 ui::NativeTheme* native_theme = linux_ui->GetNativeTheme(window);

1945 if (native_theme)	1945 if (native_theme)

1946 return native_theme;	1946 return native_theme;

1947 }	1947 }

1948	1948

1949 return ui::NativeTheme::instance();	1949 return ui::NativeTheme::instance();

1950 }	1950 }

1951	1951

1952 } // namespace views	1952 } // namespace views

OLD	NEW