Merge 22783 - Ensure that popups windows are not themed....

views/window/non_client_view.h

 // Copyright (c) 2006-2008 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.
 
 #ifndef VIEWS_WINDOW_NON_CLIENT_VIEW_H_
 #define VIEWS_WINDOW_NON_CLIENT_VIEW_H_
 
 #include "base/task.h"
 #include "views/view.h"
 #include "views/window/client_view.h"
@@ skipping 177 matching lines @@
   // Layout just the frame view. This is necessary on Windows when non-client
   // metrics such as the position of the window controls changes independently
   // of a window resize message.
   void LayoutFrameView();
 
   // NonClientView, View overrides:
   virtual gfx::Size GetPreferredSize();
   virtual gfx::Size GetMinimumSize();
   virtual void Layout();
 
+  // Call if the nonclientview is in an app or popup and we are in Vista, to
+  // force usage of glass frame.
+  void ForceAeroGlassFrame();
+
  protected:
   // NonClientView, View overrides:
   virtual void ViewHierarchyChanged(bool is_add, View* parent, View* child);
   virtual views::View* GetViewForPoint(const gfx::Point& point);
 
  private:
   // The frame that hosts this NonClientView.
   Window* frame_;
 
   // A ClientView object or subclass, responsible for sizing the contents view
   // of the window, hit testing and perhaps other tasks depending on the
   // implementation.
   ClientView* client_view_;
 
   // The NonClientFrameView that renders the non-client portions of the window.
   // This object is not owned by the view hierarchy because it can be replaced
   // dynamically as the system settings change.
   scoped_ptr<NonClientFrameView> frame_view_;
 
+  // True if the nonclientview is in an app or popup and we are in Vista. Used
+  // to force usage of glass frame.
+  bool force_aero_glass_frame_;
+
   DISALLOW_COPY_AND_ASSIGN(NonClientView);
 };
 
 }  // namespace views
 
 #endif  // #ifndef VIEWS_WINDOW_NON_CLIENT_VIEW_H_