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

Issues Search
    My Issues | Starred     Open | Closed | All

Unified Diff: chrome/browser/themes/theme_service.cc

Issue 7834048: Preliminary work to allow Chrome to build with USE_AURA (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src/
Patch Set: '' Created 9 years, 3 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 | « chrome/browser/plugin_installer_infobar_delegate.cc ('k') | chrome/browser/ui/browser.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/browser/themes/theme_service.cc
===================================================================
--- chrome/browser/themes/theme_service.cc (revision 99764)
+++ chrome/browser/themes/theme_service.cc (working copy)
@@ -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::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;
« no previous file with comments | « chrome/browser/plugin_installer_infobar_delegate.cc ('k') | chrome/browser/ui/browser.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698