| 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 1614 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 1625 internal::NativeWidgetDelegate* native_widget_delegate, | 1625 internal::NativeWidgetDelegate* native_widget_delegate, |
| 1626 DesktopNativeWidgetAura* desktop_native_widget_aura) { | 1626 DesktopNativeWidgetAura* desktop_native_widget_aura) { |
| 1627 return new DesktopWindowTreeHostX11(native_widget_delegate, | 1627 return new DesktopWindowTreeHostX11(native_widget_delegate, |
| 1628 desktop_native_widget_aura); | 1628 desktop_native_widget_aura); |
| 1629 } | 1629 } |
| 1630 | 1630 |
| 1631 // static | 1631 // static |
| 1632 ui::NativeTheme* DesktopWindowTreeHost::GetNativeTheme(aura::Window* window) { | 1632 ui::NativeTheme* DesktopWindowTreeHost::GetNativeTheme(aura::Window* window) { |
| 1633 const views::LinuxUI* linux_ui = views::LinuxUI::instance(); | 1633 const views::LinuxUI* linux_ui = views::LinuxUI::instance(); |
| 1634 if (linux_ui) { | 1634 if (linux_ui) { |
| 1635 ui::NativeTheme* native_theme = linux_ui->GetNativeTheme(); | 1635 ui::NativeTheme* native_theme = linux_ui->GetNativeTheme(window); |
| 1636 if (native_theme) | 1636 if (native_theme) |
| 1637 return native_theme; | 1637 return native_theme; |
| 1638 } | 1638 } |
| 1639 | 1639 |
| 1640 return ui::NativeTheme::instance(); | 1640 return ui::NativeTheme::instance(); |
| 1641 } | 1641 } |
| 1642 | 1642 |
| 1643 } // namespace views | 1643 } // namespace views |
| OLD | NEW |