| 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 44 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 55 #include "ui/views/views_delegate.h" | 55 #include "ui/views/views_delegate.h" |
| 56 #include "ui/views/views_switches.h" | 56 #include "ui/views/views_switches.h" |
| 57 #include "ui/views/widget/desktop_aura/desktop_drag_drop_client_aurax11.h" | 57 #include "ui/views/widget/desktop_aura/desktop_drag_drop_client_aurax11.h" |
| 58 #include "ui/views/widget/desktop_aura/desktop_native_cursor_manager.h" | 58 #include "ui/views/widget/desktop_aura/desktop_native_cursor_manager.h" |
| 59 #include "ui/views/widget/desktop_aura/desktop_native_widget_aura.h" | 59 #include "ui/views/widget/desktop_aura/desktop_native_widget_aura.h" |
| 60 #include "ui/views/widget/desktop_aura/desktop_window_tree_host_observer_x11.h" | 60 #include "ui/views/widget/desktop_aura/desktop_window_tree_host_observer_x11.h" |
| 61 #include "ui/views/widget/desktop_aura/x11_desktop_handler.h" | 61 #include "ui/views/widget/desktop_aura/x11_desktop_handler.h" |
| 62 #include "ui/views/widget/desktop_aura/x11_desktop_window_move_client.h" | 62 #include "ui/views/widget/desktop_aura/x11_desktop_window_move_client.h" |
| 63 #include "ui/views/widget/desktop_aura/x11_pointer_grab.h" | 63 #include "ui/views/widget/desktop_aura/x11_pointer_grab.h" |
| 64 #include "ui/views/widget/desktop_aura/x11_window_event_filter.h" | 64 #include "ui/views/widget/desktop_aura/x11_window_event_filter.h" |
| 65 #include "ui/views/window/native_frame_view.h" |
| 65 #include "ui/wm/core/compound_event_filter.h" | 66 #include "ui/wm/core/compound_event_filter.h" |
| 66 #include "ui/wm/core/window_util.h" | 67 #include "ui/wm/core/window_util.h" |
| 67 | 68 |
| 68 DECLARE_WINDOW_PROPERTY_TYPE(views::DesktopWindowTreeHostX11*); | 69 DECLARE_WINDOW_PROPERTY_TYPE(views::DesktopWindowTreeHostX11*); |
| 69 | 70 |
| 70 namespace views { | 71 namespace views { |
| 71 | 72 |
| 72 DesktopWindowTreeHostX11* DesktopWindowTreeHostX11::g_current_capture = | 73 DesktopWindowTreeHostX11* DesktopWindowTreeHostX11::g_current_capture = |
| 73 NULL; | 74 NULL; |
| 74 std::list<XID>* DesktopWindowTreeHostX11::open_windows_ = NULL; | 75 std::list<XID>* DesktopWindowTreeHostX11::open_windows_ = NULL; |
| (...skipping 920 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 995 | 996 |
| 996 void DesktopWindowTreeHostX11::EndMoveLoop() { | 997 void DesktopWindowTreeHostX11::EndMoveLoop() { |
| 997 x11_window_move_client_->EndMoveLoop(); | 998 x11_window_move_client_->EndMoveLoop(); |
| 998 } | 999 } |
| 999 | 1000 |
| 1000 void DesktopWindowTreeHostX11::SetVisibilityChangedAnimationsEnabled( | 1001 void DesktopWindowTreeHostX11::SetVisibilityChangedAnimationsEnabled( |
| 1001 bool value) { | 1002 bool value) { |
| 1002 // Much like the previous NativeWidgetGtk, we don't have anything to do here. | 1003 // Much like the previous NativeWidgetGtk, we don't have anything to do here. |
| 1003 } | 1004 } |
| 1004 | 1005 |
| 1006 NonClientFrameView* DesktopWindowTreeHostX11::CreateNonClientFrameView() { |
| 1007 return ShouldUseNativeFrame() |
| 1008 ? new NativeFrameView(native_widget_delegate_->AsWidget()) |
| 1009 : nullptr; |
| 1010 } |
| 1011 |
| 1005 bool DesktopWindowTreeHostX11::ShouldUseNativeFrame() const { | 1012 bool DesktopWindowTreeHostX11::ShouldUseNativeFrame() const { |
| 1006 return use_native_frame_; | 1013 return use_native_frame_; |
| 1007 } | 1014 } |
| 1008 | 1015 |
| 1009 bool DesktopWindowTreeHostX11::ShouldWindowContentsBeTransparent() const { | 1016 bool DesktopWindowTreeHostX11::ShouldWindowContentsBeTransparent() const { |
| 1010 return IsTranslucentWindowOpacitySupported(); | 1017 return IsTranslucentWindowOpacitySupported(); |
| 1011 } | 1018 } |
| 1012 | 1019 |
| 1013 void DesktopWindowTreeHostX11::FrameTypeChanged() { | 1020 void DesktopWindowTreeHostX11::FrameTypeChanged() { |
| 1014 Widget::FrameType new_type = | 1021 Widget::FrameType new_type = |
| (...skipping 1323 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 2338 if (linux_ui) { | 2345 if (linux_ui) { |
| 2339 ui::NativeTheme* native_theme = linux_ui->GetNativeTheme(window); | 2346 ui::NativeTheme* native_theme = linux_ui->GetNativeTheme(window); |
| 2340 if (native_theme) | 2347 if (native_theme) |
| 2341 return native_theme; | 2348 return native_theme; |
| 2342 } | 2349 } |
| 2343 | 2350 |
| 2344 return ui::NativeThemeAura::instance(); | 2351 return ui::NativeThemeAura::instance(); |
| 2345 } | 2352 } |
| 2346 | 2353 |
| 2347 } // namespace views | 2354 } // namespace views |
| OLD | NEW |