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

Unified Diff: ui/views/widget/native_widget_aura.cc

Issue 11367041: Adds View::GetNativeTheme() to get the NativeTheme. The interesting (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Fix include Created 8 years, 1 month 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 side-by-side diff with in-line comments
Download patch
« no previous file with comments | « ui/views/widget/native_widget_aura.h ('k') | ui/views/widget/native_widget_private.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: ui/views/widget/native_widget_aura.cc
diff --git a/ui/views/widget/native_widget_aura.cc b/ui/views/widget/native_widget_aura.cc
index 9ce9723dcfd4dee33f8d007f61411a2bba5591d7..84f59dcff661dd2dbf1e4a599fad1864b3bea128 100644
--- a/ui/views/widget/native_widget_aura.cc
+++ b/ui/views/widget/native_widget_aura.cc
@@ -23,6 +23,7 @@
#include "ui/aura/window_observer.h"
#include "ui/base/dragdrop/os_exchange_data.h"
#include "ui/base/events/event.h"
+#include "ui/base/native_theme/native_theme_aura.h"
#include "ui/base/ui_base_types.h"
#include "ui/compositor/layer.h"
#include "ui/gfx/canvas.h"
@@ -46,6 +47,10 @@
#include "ui/base/l10n/l10n_util_win.h"
#endif
+#if !defined(OS_CHROMEOS)
+#include "ui/views/widget/desktop_root_window_host.h"
+#endif
+
namespace views {
namespace {
@@ -615,6 +620,13 @@ void NativeWidgetAura::SetVisibilityChangedAnimationsEnabled(bool value) {
window_->SetProperty(aura::client::kAnimationsDisabledKey, !value);
}
+ui::NativeTheme* NativeWidgetAura::GetNativeTheme() {
+#if !defined(OS_CHROMEOS)
+ return DesktopRootWindowHost::GetNativeTheme(window_);
+#endif
+ return ui::NativeThemeAura::instance();
+}
+
////////////////////////////////////////////////////////////////////////////////
// NativeWidgetAura, views::InputMethodDelegate implementation:
« no previous file with comments | « ui/views/widget/native_widget_aura.h ('k') | ui/views/widget/native_widget_private.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698