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_root_window_host_x11.h" | 5 #include "ui/views/widget/desktop_aura/desktop_root_window_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 96 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
107 } // namespace | 107 } // namespace |
108 | 108 |
109 //////////////////////////////////////////////////////////////////////////////// | 109 //////////////////////////////////////////////////////////////////////////////// |
110 // DesktopRootWindowHostX11, public: | 110 // DesktopRootWindowHostX11, public: |
111 | 111 |
112 DesktopRootWindowHostX11::DesktopRootWindowHostX11( | 112 DesktopRootWindowHostX11::DesktopRootWindowHostX11( |
113 internal::NativeWidgetDelegate* native_widget_delegate, | 113 internal::NativeWidgetDelegate* native_widget_delegate, |
114 DesktopNativeWidgetAura* desktop_native_widget_aura, | 114 DesktopNativeWidgetAura* desktop_native_widget_aura, |
115 const gfx::Rect& initial_bounds) | 115 const gfx::Rect& initial_bounds) |
116 : close_widget_factory_(this), | 116 : close_widget_factory_(this), |
117 xdisplay_(base::MessagePumpX11::GetDefaultXDisplay()), | 117 xdisplay_(ui::GetXDisplay()), |
118 xwindow_(0), | 118 xwindow_(0), |
119 x_root_window_(DefaultRootWindow(xdisplay_)), | 119 x_root_window_(DefaultRootWindow(xdisplay_)), |
120 atom_cache_(xdisplay_, kAtomsToCache), | 120 atom_cache_(xdisplay_, kAtomsToCache), |
121 window_mapped_(false), | 121 window_mapped_(false), |
122 focus_when_shown_(false), | 122 focus_when_shown_(false), |
123 is_fullscreen_(false), | 123 is_fullscreen_(false), |
124 current_cursor_(ui::kCursorNull), | 124 current_cursor_(ui::kCursorNull), |
125 native_widget_delegate_(native_widget_delegate), | 125 native_widget_delegate_(native_widget_delegate), |
126 desktop_native_widget_aura_(desktop_native_widget_aura) { | 126 desktop_native_widget_aura_(desktop_native_widget_aura) { |
127 } | 127 } |
(...skipping 1231 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
1359 if (linux_ui) { | 1359 if (linux_ui) { |
1360 ui::NativeTheme* native_theme = linux_ui->GetNativeTheme(); | 1360 ui::NativeTheme* native_theme = linux_ui->GetNativeTheme(); |
1361 if (native_theme) | 1361 if (native_theme) |
1362 return native_theme; | 1362 return native_theme; |
1363 } | 1363 } |
1364 | 1364 |
1365 return ui::NativeTheme::instance(); | 1365 return ui::NativeTheme::instance(); |
1366 } | 1366 } |
1367 | 1367 |
1368 } // namespace views | 1368 } // namespace views |
OLD | NEW |