From 5e37c45f06e1a574b08588c6679c977eb4f8ee47 Mon Sep 17 00:00:00 2001 From: "ben@chromium.org" Date: Tue, 6 Sep 2011 19:31:39 +0000 Subject: Preliminary work to allow Chrome to build with USE_AURA. This gets browser.lib to build. http://crbug.com/93947 TEST=none Review URL: http://codereview.chromium.org/7834048 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@99787 0039d316-1c4b-4281-b951-d872f2087c98 --- chrome/browser/themes/theme_service.cc | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'chrome/browser/themes/theme_service.cc') diff --git a/chrome/browser/themes/theme_service.cc b/chrome/browser/themes/theme_service.cc index 6769b2e..220afe9 100644 --- a/chrome/browser/themes/theme_service.cc +++ b/chrome/browser/themes/theme_service.cc @@ -20,7 +20,7 @@ #include "grit/ui_resources.h" #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 @@ -270,7 +270,7 @@ bool ThemeService::GetDisplayProperty(int id, int* result) const { bool ThemeService::ShouldUseNativeFrame() const { if (HasCustomImage(IDR_THEME_FRAME)) return false; -#if defined(OS_WIN) +#if defined(OS_WIN) && !defined(USE_AURA) return views::NativeWidgetWin::IsAeroGlassEnabled(); #else return false; -- cgit v1.1