Preliminary work to allow Chrome to build with USE_AURA

chrome/browser/themes/theme_service.cc

 // Copyright (c) 2011 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "chrome/browser/themes/theme_service.h"
 
 #include "base/string_split.h"
 #include "base/string_util.h"
 #include "base/utf_string_conversions.h"
 #include "chrome/browser/extensions/extension_service.h"
 #include "chrome/browser/profiles/profile.h"
 #include "chrome/browser/themes/browser_theme_pack.h"
 #include "chrome/common/chrome_constants.h"
 #include "chrome/common/chrome_notification_types.h"
 #include "chrome/common/pref_names.h"
 #include "content/browser/user_metrics.h"
 #include "content/common/notification_service.h"
 #include "grit/theme_resources.h"
 #include "grit/theme_resources_standard.h"
 #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
 
 // Strings used in alignment properties.
 const char* ThemeService::kAlignmentTop = "top";
 const char* ThemeService::kAlignmentBottom = "bottom";
 const char* ThemeService::kAlignmentLeft = "left";
 const char* ThemeService::kAlignmentRight = "right";
 
 // Strings used in background tiling repetition properties.
@@ skipping 229 matching lines @@
 bool ThemeService::GetDisplayProperty(int id, int* result) const {
   if (theme_pack_.get())
     return theme_pack_->GetDisplayProperty(id, result);
 
   return GetDefaultDisplayProperty(id, result);
 }
 
 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;
 #endif
 }
 
 bool ThemeService::HasCustomImage(int id) const {
   if (!HasThemeableImage(id))
     return false;
 
@@ skipping 374 matching lines @@
 void ThemeService::OnInfobarDisplayed() {
   number_of_infobars_++;
 }
 
 void ThemeService::OnInfobarDestroyed() {
   number_of_infobars_--;
 
   if (number_of_infobars_ == 0)
     RemoveUnusedThemes();
 }