| 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> |
| (...skipping 271 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 282 | 282 |
| 283 x11_window_move_client_.reset(new X11DesktopWindowMoveClient); | 283 x11_window_move_client_.reset(new X11DesktopWindowMoveClient); |
| 284 aura::client::SetWindowMoveClient(window(), x11_window_move_client_.get()); | 284 aura::client::SetWindowMoveClient(window(), x11_window_move_client_.get()); |
| 285 | 285 |
| 286 SetWindowTransparency(); | 286 SetWindowTransparency(); |
| 287 | 287 |
| 288 native_widget_delegate_->OnNativeWidgetCreated(true); | 288 native_widget_delegate_->OnNativeWidgetCreated(true); |
| 289 } | 289 } |
| 290 | 290 |
| 291 scoped_ptr<corewm::Tooltip> DesktopWindowTreeHostX11::CreateTooltip() { | 291 scoped_ptr<corewm::Tooltip> DesktopWindowTreeHostX11::CreateTooltip() { |
| 292 return make_scoped_ptr(new corewm::TooltipAura(gfx::SCREEN_TYPE_NATIVE)); | 292 return make_scoped_ptr(new corewm::TooltipAura); |
| 293 } | 293 } |
| 294 | 294 |
| 295 scoped_ptr<aura::client::DragDropClient> | 295 scoped_ptr<aura::client::DragDropClient> |
| 296 DesktopWindowTreeHostX11::CreateDragDropClient( | 296 DesktopWindowTreeHostX11::CreateDragDropClient( |
| 297 DesktopNativeCursorManager* cursor_manager) { | 297 DesktopNativeCursorManager* cursor_manager) { |
| 298 drag_drop_client_ = new DesktopDragDropClientAuraX11( | 298 drag_drop_client_ = new DesktopDragDropClientAuraX11( |
| 299 window(), cursor_manager, xdisplay_, xwindow_); | 299 window(), cursor_manager, xdisplay_, xwindow_); |
| 300 drag_drop_client_->Init(); | 300 drag_drop_client_->Init(); |
| 301 return make_scoped_ptr(drag_drop_client_); | 301 return make_scoped_ptr(drag_drop_client_); |
| 302 } | 302 } |
| (...skipping 1628 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 1931 if (linux_ui) { | 1931 if (linux_ui) { |
| 1932 ui::NativeTheme* native_theme = linux_ui->GetNativeTheme(window); | 1932 ui::NativeTheme* native_theme = linux_ui->GetNativeTheme(window); |
| 1933 if (native_theme) | 1933 if (native_theme) |
| 1934 return native_theme; | 1934 return native_theme; |
| 1935 } | 1935 } |
| 1936 | 1936 |
| 1937 return ui::NativeTheme::instance(); | 1937 return ui::NativeTheme::instance(); |
| 1938 } | 1938 } |
| 1939 | 1939 |
| 1940 } // namespace views | 1940 } // namespace views |
| OLD | NEW |