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

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

Issue 801953002: Use template specialization to generate WindowProperty code (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: use namespace Created 6 years 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
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 35 matching lines...) Expand 10 before | Expand all | Expand 10 after
46 #include "ui/views/widget/desktop_aura/desktop_drag_drop_client_aurax11.h" 46 #include "ui/views/widget/desktop_aura/desktop_drag_drop_client_aurax11.h"
47 #include "ui/views/widget/desktop_aura/desktop_native_cursor_manager.h" 47 #include "ui/views/widget/desktop_aura/desktop_native_cursor_manager.h"
48 #include "ui/views/widget/desktop_aura/desktop_native_widget_aura.h" 48 #include "ui/views/widget/desktop_aura/desktop_native_widget_aura.h"
49 #include "ui/views/widget/desktop_aura/desktop_window_tree_host_observer_x11.h" 49 #include "ui/views/widget/desktop_aura/desktop_window_tree_host_observer_x11.h"
50 #include "ui/views/widget/desktop_aura/x11_desktop_handler.h" 50 #include "ui/views/widget/desktop_aura/x11_desktop_handler.h"
51 #include "ui/views/widget/desktop_aura/x11_desktop_window_move_client.h" 51 #include "ui/views/widget/desktop_aura/x11_desktop_window_move_client.h"
52 #include "ui/views/widget/desktop_aura/x11_window_event_filter.h" 52 #include "ui/views/widget/desktop_aura/x11_window_event_filter.h"
53 #include "ui/wm/core/compound_event_filter.h" 53 #include "ui/wm/core/compound_event_filter.h"
54 #include "ui/wm/core/window_util.h" 54 #include "ui/wm/core/window_util.h"
55 55
56 DECLARE_WINDOW_PROPERTY_TYPE(views::DesktopWindowTreeHostX11*);
57
56 namespace views { 58 namespace views {
57 59
58 DesktopWindowTreeHostX11* DesktopWindowTreeHostX11::g_current_capture = 60 DesktopWindowTreeHostX11* DesktopWindowTreeHostX11::g_current_capture =
59 NULL; 61 NULL;
60 std::list<XID>* DesktopWindowTreeHostX11::open_windows_ = NULL; 62 std::list<XID>* DesktopWindowTreeHostX11::open_windows_ = NULL;
61 63
62 DEFINE_WINDOW_PROPERTY_KEY( 64 DEFINE_WINDOW_PROPERTY_KEY(
63 aura::Window*, kViewsWindowForRootWindow, NULL); 65 aura::Window*, kViewsWindowForRootWindow, NULL);
64 66
65 DEFINE_WINDOW_PROPERTY_KEY( 67 DEFINE_WINDOW_PROPERTY_KEY(
(...skipping 1862 matching lines...) Expand 10 before | Expand all | Expand 10 after
1928 if (linux_ui) { 1930 if (linux_ui) {
1929 ui::NativeTheme* native_theme = linux_ui->GetNativeTheme(window); 1931 ui::NativeTheme* native_theme = linux_ui->GetNativeTheme(window);
1930 if (native_theme) 1932 if (native_theme)
1931 return native_theme; 1933 return native_theme;
1932 } 1934 }
1933 1935
1934 return ui::NativeTheme::instance(); 1936 return ui::NativeTheme::instance();
1935 } 1937 }
1936 1938
1937 } // namespace views 1939 } // namespace views
OLDNEW
« no previous file with comments | « ui/views/widget/desktop_aura/desktop_window_tree_host_win.cc ('k') | ui/wm/core/transient_window_manager.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698