| 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 22 matching lines...) Expand all Loading... |
| 33 #include "ui/events/platform/x11/x11_event_source.h" | 33 #include "ui/events/platform/x11/x11_event_source.h" |
| 34 #include "ui/gfx/display.h" | 34 #include "ui/gfx/display.h" |
| 35 #include "ui/gfx/geometry/insets.h" | 35 #include "ui/gfx/geometry/insets.h" |
| 36 #include "ui/gfx/geometry/size_conversions.h" | 36 #include "ui/gfx/geometry/size_conversions.h" |
| 37 #include "ui/gfx/image/image_skia.h" | 37 #include "ui/gfx/image/image_skia.h" |
| 38 #include "ui/gfx/image/image_skia_rep.h" | 38 #include "ui/gfx/image/image_skia_rep.h" |
| 39 #include "ui/gfx/path.h" | 39 #include "ui/gfx/path.h" |
| 40 #include "ui/gfx/path_x11.h" | 40 #include "ui/gfx/path_x11.h" |
| 41 #include "ui/gfx/screen.h" | 41 #include "ui/gfx/screen.h" |
| 42 #include "ui/native_theme/native_theme.h" | 42 #include "ui/native_theme/native_theme.h" |
| 43 #include "ui/native_theme/native_theme_aura.h" |
| 43 #include "ui/views/corewm/tooltip_aura.h" | 44 #include "ui/views/corewm/tooltip_aura.h" |
| 44 #include "ui/views/linux_ui/linux_ui.h" | 45 #include "ui/views/linux_ui/linux_ui.h" |
| 45 #include "ui/views/views_delegate.h" | 46 #include "ui/views/views_delegate.h" |
| 46 #include "ui/views/views_switches.h" | 47 #include "ui/views/views_switches.h" |
| 47 #include "ui/views/widget/desktop_aura/desktop_drag_drop_client_aurax11.h" | 48 #include "ui/views/widget/desktop_aura/desktop_drag_drop_client_aurax11.h" |
| 48 #include "ui/views/widget/desktop_aura/desktop_native_cursor_manager.h" | 49 #include "ui/views/widget/desktop_aura/desktop_native_cursor_manager.h" |
| 49 #include "ui/views/widget/desktop_aura/desktop_native_widget_aura.h" | 50 #include "ui/views/widget/desktop_aura/desktop_native_widget_aura.h" |
| 50 #include "ui/views/widget/desktop_aura/desktop_window_tree_host_observer_x11.h" | 51 #include "ui/views/widget/desktop_aura/desktop_window_tree_host_observer_x11.h" |
| 51 #include "ui/views/widget/desktop_aura/x11_desktop_handler.h" | 52 #include "ui/views/widget/desktop_aura/x11_desktop_handler.h" |
| 52 #include "ui/views/widget/desktop_aura/x11_desktop_window_move_client.h" | 53 #include "ui/views/widget/desktop_aura/x11_desktop_window_move_client.h" |
| (...skipping 2009 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 2062 | 2063 |
| 2063 // static | 2064 // static |
| 2064 ui::NativeTheme* DesktopWindowTreeHost::GetNativeTheme(aura::Window* window) { | 2065 ui::NativeTheme* DesktopWindowTreeHost::GetNativeTheme(aura::Window* window) { |
| 2065 const views::LinuxUI* linux_ui = views::LinuxUI::instance(); | 2066 const views::LinuxUI* linux_ui = views::LinuxUI::instance(); |
| 2066 if (linux_ui) { | 2067 if (linux_ui) { |
| 2067 ui::NativeTheme* native_theme = linux_ui->GetNativeTheme(window); | 2068 ui::NativeTheme* native_theme = linux_ui->GetNativeTheme(window); |
| 2068 if (native_theme) | 2069 if (native_theme) |
| 2069 return native_theme; | 2070 return native_theme; |
| 2070 } | 2071 } |
| 2071 | 2072 |
| 2072 return ui::NativeTheme::instance(); | 2073 return ui::NativeThemeAura::instance(); |
| 2073 } | 2074 } |
| 2074 | 2075 |
| 2075 } // namespace views | 2076 } // namespace views |
| OLD | NEW |