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/Xatom.h> | 7 #include <X11/Xatom.h> |
8 #include <X11/Xregion.h> | 8 #include <X11/Xregion.h> |
9 #include <X11/Xutil.h> | 9 #include <X11/Xutil.h> |
10 #include <X11/extensions/XInput2.h> | 10 #include <X11/extensions/XInput2.h> |
(...skipping 753 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
764 void DesktopWindowTreeHostX11::SetVisibilityChangedAnimationsEnabled( | 764 void DesktopWindowTreeHostX11::SetVisibilityChangedAnimationsEnabled( |
765 bool value) { | 765 bool value) { |
766 // Much like the previous NativeWidgetGtk, we don't have anything to do here. | 766 // Much like the previous NativeWidgetGtk, we don't have anything to do here. |
767 } | 767 } |
768 | 768 |
769 bool DesktopWindowTreeHostX11::ShouldUseNativeFrame() const { | 769 bool DesktopWindowTreeHostX11::ShouldUseNativeFrame() const { |
770 return use_native_frame_; | 770 return use_native_frame_; |
771 } | 771 } |
772 | 772 |
773 bool DesktopWindowTreeHostX11::ShouldWindowContentsBeTransparent() const { | 773 bool DesktopWindowTreeHostX11::ShouldWindowContentsBeTransparent() const { |
774 return false; | 774 // See SetWindowTransparency(). |
| 775 return use_argb_visual_; |
775 } | 776 } |
776 | 777 |
777 void DesktopWindowTreeHostX11::FrameTypeChanged() { | 778 void DesktopWindowTreeHostX11::FrameTypeChanged() { |
778 Widget::FrameType new_type = | 779 Widget::FrameType new_type = |
779 native_widget_delegate_->AsWidget()->frame_type(); | 780 native_widget_delegate_->AsWidget()->frame_type(); |
780 if (new_type == Widget::FRAME_TYPE_DEFAULT) { | 781 if (new_type == Widget::FRAME_TYPE_DEFAULT) { |
781 // The default is determined by Widget::InitParams::remove_standard_frame | 782 // The default is determined by Widget::InitParams::remove_standard_frame |
782 // and does not change. | 783 // and does not change. |
783 return; | 784 return; |
784 } | 785 } |
(...skipping 1250 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
2035 if (linux_ui) { | 2036 if (linux_ui) { |
2036 ui::NativeTheme* native_theme = linux_ui->GetNativeTheme(window); | 2037 ui::NativeTheme* native_theme = linux_ui->GetNativeTheme(window); |
2037 if (native_theme) | 2038 if (native_theme) |
2038 return native_theme; | 2039 return native_theme; |
2039 } | 2040 } |
2040 | 2041 |
2041 return ui::NativeThemeAura::instance(); | 2042 return ui::NativeThemeAura::instance(); |
2042 } | 2043 } |
2043 | 2044 |
2044 } // namespace views | 2045 } // namespace views |
OLD | NEW |