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

views/window/non_client_view.cc

Index: views/window/non_client_view.cc
===================================================================
--- views/window/non_client_view.cc	(revision 23153)
+++ views/window/non_client_view.cc	(working copy)
@@ -32,7 +32,8 @@
 
 NonClientView::NonClientView(Window* frame)
     : frame_(frame),
-      client_view_(NULL) {
+      client_view_(NULL),
+      force_aero_glass_frame_(false) {
 }
 
 NonClientView::~NonClientView() {
@@ -68,6 +69,8 @@
 }
 
 bool NonClientView::UseNativeFrame() const {
+  if (force_aero_glass_frame_)
+    return true;
   // The frame view may always require a custom frame, e.g. Constrained Windows.
   if (frame_view_.get() && frame_view_->AlwaysUseCustomFrame())
     return false;
@@ -184,6 +187,10 @@
   return View::GetViewForPoint(point);
 }
 
+void NonClientView::ForceAeroGlassFrame() {
+  force_aero_glass_frame_ = true;
+}
+
 ////////////////////////////////////////////////////////////////////////////////
 // NonClientFrameView, View overrides:
 
Property changes on: views\window\non_client_view.cc
___________________________________________________________________
Modified: svn:mergeinfo
   Merged /trunk/src/views/window/non_client_view.cc:r22783