Move more methods from NWW to HWNDMessageHandler.

chrome/browser/themes/theme_service.cc

 // Copyright (c) 2012 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/bind.h"
 #include "base/memory/ref_counted_memory.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/prefs/pref_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/public/browser/notification_service.h"
 #include "content/public/browser/user_metrics.h"
 #include "grit/theme_resources.h"
 #include "grit/ui_resources.h"
 #include "ui/base/layout.h"
 #include "ui/base/resource/resource_bundle.h"
 #include "ui/gfx/image/image_skia.h"
 
 #if defined(OS_WIN) && !defined(USE_AURA)
-#include "ui/views/widget/native_widget_win.h"
+#include "ui/base/win/shell.h"
 #endif
 
 #if defined(USE_AURA) && !defined(USE_ASH) && defined(OS_LINUX)
 #include "ui/base/linux_ui.h"
 #endif
 
 using content::BrowserThread;
 using content::UserMetricsAction;
 using extensions::Extension;
 using ui::ResourceBundle;
@@ skipping 274 matching lines @@
   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) && !defined(USE_AURA)
-  return views::NativeWidgetWin::IsAeroGlassEnabled();
+  return ui::win::IsAeroGlassEnabled();
 #else
   return false;
 #endif
 }
 
 bool ThemeService::HasCustomImage(int id) const {
   if (!HasThemeableImage(id))
     return false;
 
   if (theme_pack_)
@@ skipping 379 matching lines @@
 void ThemeService::OnInfobarDisplayed() {
   number_of_infobars_++;
 }
 
 void ThemeService::OnInfobarDestroyed() {
   number_of_infobars_--;
 
   if (number_of_infobars_ == 0)
     RemoveUnusedThemes();
 }