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

Unified Diff: views/widget/default_theme_provider.cc

Issue 7741001: Add Aura support to views: (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src/
Patch Set: '' Created 9 years, 4 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 side-by-side diff with in-line comments
Download patch
« no previous file with comments | « views/views.gyp ('k') | views/widget/native_widget_aura.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: views/widget/default_theme_provider.cc
===================================================================
--- views/widget/default_theme_provider.cc (revision 98084)
+++ views/widget/default_theme_provider.cc (working copy)
@@ -6,7 +6,7 @@
#include "ui/base/resource/resource_bundle.h"
-#if defined(OS_WIN)
+#if defined(OS_WIN) && !defined(USE_AURA)
#include "views/widget/native_widget_win.h"
#endif
@@ -32,7 +32,7 @@
}
bool DefaultThemeProvider::ShouldUseNativeFrame() const {
-#if defined(OS_WIN)
+#if defined(OS_WIN) && !defined(USE_AURA)
return NativeWidgetWin::IsAeroGlassEnabled();
#else
return false;
« no previous file with comments | « views/views.gyp ('k') | views/widget/native_widget_aura.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698