Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(58)

Side by Side Diff: ui/views/widget/desktop_aura/desktop_window_tree_host_x11.cc

Issue 243633003: use the right NativeTheme on bubbles + dialogs on Aura Linux (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: rejigger Created 6 years, 8 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch | Annotate | Revision Log
« no previous file with comments | « ui/views/linux_ui/linux_ui.h ('k') | no next file » | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
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
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
OLDNEW
« no previous file with comments | « ui/views/linux_ui/linux_ui.h ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698