Preliminary work to allow Chrome to build with USE_AURA

chrome/browser/ui/views/constrained_window_views.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/ui/views/constrained_window_views.h"
 
 #include <algorithm>
 
 #include "chrome/app/chrome_command_ids.h"
 #include "chrome/browser/profiles/profile.h"
@@ skipping 17 matching lines @@
 #include "ui/gfx/path.h"
 #include "ui/gfx/rect.h"
 #include "views/controls/button/image_button.h"
 #include "views/focus/focus_manager.h"
 #include "views/widget/widget.h"
 #include "views/window/client_view.h"
 #include "views/window/non_client_view.h"
 #include "views/window/window_resources.h"
 #include "views/window/window_shape.h"
 
-#if defined(OS_WIN)
+#if defined(OS_WIN) && !defined(USE_AURA)
 #include "views/widget/native_widget_win.h"
 #endif
 
 using base::TimeDelta;
 
 namespace views {
 class ClientView;
 }
 
 // An enumeration of bitmap resources used by this window.
@@ skipping 149 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()->browser_context()->IsOffTheRecord()
-#if defined(OS_WIN)
+#if defined(OS_WIN) && !defined(USE_AURA)
             || !views::NativeWidgetWin::IsAeroGlassEnabled()
 #endif
             ? SK_ColorWHITE : SK_ColorBLACK;
   }
 
   // Loads the appropriate set of WindowResources for the frame view.
   void InitWindowResources();
 
   ConstrainedWindowViews* container_;
 
@@ skipping 319 matching lines @@
     int width,
     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(USE_AURA)
   resources_.reset(views::NativeWidgetWin::IsAeroGlassEnabled() ?
-    static_cast<views::WindowResources*>(new VistaWindowResources) :
-    new XPWindowResources);
+      static_cast<views::WindowResources*>(new VistaWindowResources) :
+      new XPWindowResources);
+#endif
 }
 
 // static
 void ConstrainedWindowFrameView::InitClass() {
   static bool initialized = false;
   if (!initialized) {
-#if defined(OS_WIN)
+#if defined(OS_WIN) && !defined(USE_AURA)
     title_font_ = new gfx::Font(views::NativeWidgetWin::GetWindowTitleFont());
 #endif

[sky, 2011/09/06 17:22:48]

#else NOTIMPLEMENTED? Also, do we need to set title_font_?

     initialized = true;
   }
 }
 
 ////////////////////////////////////////////////////////////////////////////////
 // ConstrainedWindowViews, public:
 
 ConstrainedWindowViews::ConstrainedWindowViews(
     TabContents* owner,
     views::WidgetDelegate* widget_delegate)
@@ skipping 55 matching lines @@
 }
 
 void ConstrainedWindowViews::OnNativeConstrainedWindowMouseActivate() {
   Activate();
 }
 
 views::internal::NativeWidgetDelegate*
     ConstrainedWindowViews::AsNativeWidgetDelegate() {
   return this;
 }