Move more methods from NWW to HWNDMessageHandler.

chrome/browser/ui/views/constrained_window_views.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/ui/views/constrained_window_views.h"
 
 #include <algorithm>
 
 #include "base/command_line.h"
 #include "base/utf_string_conversions.h"
@@ skipping 29 matching lines @@
 #include "ui/views/views_delegate.h"
 #include "ui/views/widget/widget.h"
 #include "ui/views/window/client_view.h"
 #include "ui/views/window/frame_background.h"
 #include "ui/views/window/non_client_view.h"
 #include "ui/views/window/window_resources.h"
 #include "ui/views/window/window_shape.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_ASH)
 #include "ash/ash_constants.h"
 #include "ash/ash_switches.h"
 #include "ash/shell.h"
 #include "ash/wm/custom_frame_view_ash.h"
 #include "ash/wm/visibility_controller.h"
 #include "ui/aura/window.h"
 #endif
@@ skipping 156 matching lines @@
   // Layout various sub-components of this view.
   void LayoutWindowControls();
   void LayoutTitleBar();
 
   // Returns the bounds of the client area for the specified view size.
   gfx::Rect CalculateClientAreaBounds(int width, int height) const;
 
   SkColor GetTitleColor() const {
     return container_->owner()->profile()->IsOffTheRecord()
 #if defined(OS_WIN) && !defined(USE_AURA)
-            || !views::NativeWidgetWin::IsAeroGlassEnabled()
+            || !ui::win::IsAeroGlassEnabled()
 #endif
             ? SK_ColorWHITE : SK_ColorBLACK;
   }
 
   // Loads the appropriate set of WindowResources for the frame view.
   void InitWindowResources();
 
   ConstrainedWindowViews* container_;
 
   scoped_ptr<views::WindowResources> resources_;
@@ skipping 273 matching lines @@
     int height) const {
   int top_height = NonClientTopBorderHeight();
   int border_thickness = NonClientBorderThickness();
   return gfx::Rect(border_thickness, top_height,
                    std::max(0, width - (2 * border_thickness)),
                    std::max(0, height - top_height - border_thickness));
 }
 
 void ConstrainedWindowFrameView::InitWindowResources() {
 #if defined(OS_WIN) && !defined(USE_AURA)
-  resources_.reset(views::NativeWidgetWin::IsAeroGlassEnabled() ?
+  resources_.reset(ui::win::IsAeroGlassEnabled() ?
       static_cast<views::WindowResources*>(new VistaWindowResources) :
       new XPWindowResources);
 #else
   // TODO(oshima): Use aura frame decoration.
   resources_.reset(new XPWindowResources);
 #endif
 }
 
 // static
 void ConstrainedWindowFrameView::InitClass() {
@@ skipping 148 matching lines @@
 
 views::internal::NativeWidgetDelegate*
     ConstrainedWindowViews::AsNativeWidgetDelegate() {
   return this;
 }
 
 int ConstrainedWindowViews::GetNonClientComponent(const gfx::Point& point) {
   // Prevent a constrained window to be moved by the user.
   return HTNOWHERE;
 }