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

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

Issue 194843004: Move files from ui/views/corewm to ui/wm/core (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: . Created 6 years, 9 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>
(...skipping 15 matching lines...) Expand all
26 #include "ui/events/event_utils.h" 26 #include "ui/events/event_utils.h"
27 #include "ui/events/x/device_data_manager.h" 27 #include "ui/events/x/device_data_manager.h"
28 #include "ui/events/x/device_list_cache_x.h" 28 #include "ui/events/x/device_list_cache_x.h"
29 #include "ui/events/x/touch_factory_x11.h" 29 #include "ui/events/x/touch_factory_x11.h"
30 #include "ui/gfx/image/image_skia.h" 30 #include "ui/gfx/image/image_skia.h"
31 #include "ui/gfx/image/image_skia_rep.h" 31 #include "ui/gfx/image/image_skia_rep.h"
32 #include "ui/gfx/insets.h" 32 #include "ui/gfx/insets.h"
33 #include "ui/gfx/path.h" 33 #include "ui/gfx/path.h"
34 #include "ui/gfx/path_x11.h" 34 #include "ui/gfx/path_x11.h"
35 #include "ui/native_theme/native_theme.h" 35 #include "ui/native_theme/native_theme.h"
36 #include "ui/views/corewm/compound_event_filter.h"
37 #include "ui/views/corewm/corewm_switches.h"
38 #include "ui/views/corewm/tooltip_aura.h" 36 #include "ui/views/corewm/tooltip_aura.h"
39 #include "ui/views/corewm/window_util.h"
40 #include "ui/views/ime/input_method.h" 37 #include "ui/views/ime/input_method.h"
41 #include "ui/views/linux_ui/linux_ui.h" 38 #include "ui/views/linux_ui/linux_ui.h"
42 #include "ui/views/views_delegate.h" 39 #include "ui/views/views_delegate.h"
43 #include "ui/views/widget/desktop_aura/desktop_dispatcher_client.h" 40 #include "ui/views/widget/desktop_aura/desktop_dispatcher_client.h"
44 #include "ui/views/widget/desktop_aura/desktop_drag_drop_client_aurax11.h" 41 #include "ui/views/widget/desktop_aura/desktop_drag_drop_client_aurax11.h"
45 #include "ui/views/widget/desktop_aura/desktop_native_cursor_manager.h" 42 #include "ui/views/widget/desktop_aura/desktop_native_cursor_manager.h"
46 #include "ui/views/widget/desktop_aura/desktop_native_widget_aura.h" 43 #include "ui/views/widget/desktop_aura/desktop_native_widget_aura.h"
47 #include "ui/views/widget/desktop_aura/desktop_window_tree_host_observer_x11.h" 44 #include "ui/views/widget/desktop_aura/desktop_window_tree_host_observer_x11.h"
48 #include "ui/views/widget/desktop_aura/x11_desktop_handler.h" 45 #include "ui/views/widget/desktop_aura/x11_desktop_handler.h"
49 #include "ui/views/widget/desktop_aura/x11_desktop_window_move_client.h" 46 #include "ui/views/widget/desktop_aura/x11_desktop_window_move_client.h"
50 #include "ui/views/widget/desktop_aura/x11_scoped_capture.h" 47 #include "ui/views/widget/desktop_aura/x11_scoped_capture.h"
51 #include "ui/views/widget/desktop_aura/x11_window_event_filter.h" 48 #include "ui/views/widget/desktop_aura/x11_window_event_filter.h"
49 #include "ui/wm/core/compound_event_filter.h"
50 #include "ui/wm/core/window_util.h"
52 51
53 namespace views { 52 namespace views {
54 53
55 DesktopWindowTreeHostX11* DesktopWindowTreeHostX11::g_current_capture = 54 DesktopWindowTreeHostX11* DesktopWindowTreeHostX11::g_current_capture =
56 NULL; 55 NULL;
57 std::list<XID>* DesktopWindowTreeHostX11::open_windows_ = NULL; 56 std::list<XID>* DesktopWindowTreeHostX11::open_windows_ = NULL;
58 57
59 DEFINE_WINDOW_PROPERTY_KEY( 58 DEFINE_WINDOW_PROPERTY_KEY(
60 aura::Window*, kViewsWindowForRootWindow, NULL); 59 aura::Window*, kViewsWindowForRootWindow, NULL);
61 60
(...skipping 1503 matching lines...) Expand 10 before | Expand all | Expand 10 after
1565 if (linux_ui) { 1564 if (linux_ui) {
1566 ui::NativeTheme* native_theme = linux_ui->GetNativeTheme(); 1565 ui::NativeTheme* native_theme = linux_ui->GetNativeTheme();
1567 if (native_theme) 1566 if (native_theme)
1568 return native_theme; 1567 return native_theme;
1569 } 1568 }
1570 1569
1571 return ui::NativeTheme::instance(); 1570 return ui::NativeTheme::instance();
1572 } 1571 }
1573 1572
1574 } // namespace views 1573 } // namespace views
OLDNEW
« no previous file with comments | « ui/views/widget/desktop_aura/desktop_window_tree_host_win.cc ('k') | ui/views/widget/native_widget_aura.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698