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

views/window/non_client_view.h

Index: views/window/non_client_view.h
===================================================================
--- views/window/non_client_view.h	(revision 23153)
+++ views/window/non_client_view.h	(working copy)
@@ -195,6 +195,10 @@
   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);
@@ -214,6 +218,10 @@
   // 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);
 };
 
Property changes on: views\window\non_client_view.h
___________________________________________________________________
Modified: svn:mergeinfo
   Merged /trunk/src/views/window/non_client_view.h:r22783