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 24 matching lines...) Expand all Loading... |
35 #include "ui/events/platform/x11/x11_event_source.h" | 35 #include "ui/events/platform/x11/x11_event_source.h" |
36 #include "ui/gfx/display.h" | 36 #include "ui/gfx/display.h" |
37 #include "ui/gfx/geometry/insets.h" | 37 #include "ui/gfx/geometry/insets.h" |
38 #include "ui/gfx/geometry/size_conversions.h" | 38 #include "ui/gfx/geometry/size_conversions.h" |
39 #include "ui/gfx/image/image_skia.h" | 39 #include "ui/gfx/image/image_skia.h" |
40 #include "ui/gfx/image/image_skia_rep.h" | 40 #include "ui/gfx/image/image_skia_rep.h" |
41 #include "ui/gfx/path.h" | 41 #include "ui/gfx/path.h" |
42 #include "ui/gfx/path_x11.h" | 42 #include "ui/gfx/path_x11.h" |
43 #include "ui/gfx/screen.h" | 43 #include "ui/gfx/screen.h" |
44 #include "ui/native_theme/native_theme.h" | 44 #include "ui/native_theme/native_theme.h" |
| 45 #include "ui/native_theme/native_theme_aura.h" |
45 #include "ui/views/corewm/tooltip_aura.h" | 46 #include "ui/views/corewm/tooltip_aura.h" |
46 #include "ui/views/linux_ui/linux_ui.h" | 47 #include "ui/views/linux_ui/linux_ui.h" |
47 #include "ui/views/views_delegate.h" | 48 #include "ui/views/views_delegate.h" |
48 #include "ui/views/views_switches.h" | 49 #include "ui/views/views_switches.h" |
49 #include "ui/views/widget/desktop_aura/desktop_drag_drop_client_aurax11.h" | 50 #include "ui/views/widget/desktop_aura/desktop_drag_drop_client_aurax11.h" |
50 #include "ui/views/widget/desktop_aura/desktop_native_cursor_manager.h" | 51 #include "ui/views/widget/desktop_aura/desktop_native_cursor_manager.h" |
51 #include "ui/views/widget/desktop_aura/desktop_native_widget_aura.h" | 52 #include "ui/views/widget/desktop_aura/desktop_native_widget_aura.h" |
52 #include "ui/views/widget/desktop_aura/desktop_window_tree_host_observer_x11.h" | 53 #include "ui/views/widget/desktop_aura/desktop_window_tree_host_observer_x11.h" |
53 #include "ui/views/widget/desktop_aura/x11_desktop_handler.h" | 54 #include "ui/views/widget/desktop_aura/x11_desktop_handler.h" |
54 #include "ui/views/widget/desktop_aura/x11_desktop_window_move_client.h" | 55 #include "ui/views/widget/desktop_aura/x11_desktop_window_move_client.h" |
(...skipping 1994 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
2049 | 2050 |
2050 // static | 2051 // static |
2051 ui::NativeTheme* DesktopWindowTreeHost::GetNativeTheme(aura::Window* window) { | 2052 ui::NativeTheme* DesktopWindowTreeHost::GetNativeTheme(aura::Window* window) { |
2052 const views::LinuxUI* linux_ui = views::LinuxUI::instance(); | 2053 const views::LinuxUI* linux_ui = views::LinuxUI::instance(); |
2053 if (linux_ui) { | 2054 if (linux_ui) { |
2054 ui::NativeTheme* native_theme = linux_ui->GetNativeTheme(window); | 2055 ui::NativeTheme* native_theme = linux_ui->GetNativeTheme(window); |
2055 if (native_theme) | 2056 if (native_theme) |
2056 return native_theme; | 2057 return native_theme; |
2057 } | 2058 } |
2058 | 2059 |
2059 return ui::NativeTheme::instance(); | 2060 return ui::NativeThemeAura::instance(); |
2060 } | 2061 } |
2061 | 2062 |
2062 } // namespace views | 2063 } // namespace views |
OLD | NEW |