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

views/window/non_client_view.cc

 // 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.
 
 #include "views/window/non_client_view.h"
 
 #include "app/theme_provider.h"
 #include "views/widget/root_view.h"
 #include "views/widget/widget.h"
 #include "views/window/window.h"
@@ skipping 14 matching lines @@
 // z-order first and we always want the client view to have first crack at
 // handling mouse messages.
 static const int kFrameViewIndex = 0;
 static const int kClientViewIndex = 1;
 
 ////////////////////////////////////////////////////////////////////////////////
 // NonClientView, public:
 
 NonClientView::NonClientView(Window* frame)
     : frame_(frame),
-      client_view_(NULL) {
+      client_view_(NULL),
+      force_aero_glass_frame_(false) {
 }
 
 NonClientView::~NonClientView() {
   // This value may have been reset before the window hierarchy shuts down,
   // so we need to manually remove it.
   RemoveChildView(frame_view_.get());
 }
 
 void NonClientView::SetFrameView(NonClientFrameView* frame_view) {
   // See comment in header about ownership.
@@ skipping 15 matching lines @@
 
 void NonClientView::UpdateFrame() {
   SetFrameView(frame_->CreateFrameViewForWindow());
   GetRootView()->ThemeChanged();
   Layout();
   SchedulePaint();
   frame_->UpdateFrameAfterFrameChange();
 }
 
 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;
   return frame_->ShouldUseNativeFrame();
 }
 
 void NonClientView::DisableInactiveRendering(bool disable) {
   frame_view_->DisableInactiveRendering(disable);
 }
 
@@ skipping 96 matching lines @@
   // The assumption is that the frame view's implementation of HitTest will only
   // return true for area not occupied by the client view.
   gfx::Point point_in_child_coords(point);
   View::ConvertPointToView(this, frame_view_.get(), &point_in_child_coords);
   if (frame_view_->HitTest(point_in_child_coords))
     return frame_view_->GetViewForPoint(point);
 
   return View::GetViewForPoint(point);
 }
 
+void NonClientView::ForceAeroGlassFrame() {
+  force_aero_glass_frame_ = true;
+}
+
 ////////////////////////////////////////////////////////////////////////////////
 // NonClientFrameView, View overrides:
 
 bool NonClientFrameView::HitTest(const gfx::Point& l) const {
   // For the default case, we assume the non-client frame view never overlaps
   // the client view.
   return !GetWindow()->GetClientView()->bounds().Contains(l);
 }
 
 void NonClientFrameView::DidChangeBounds(const gfx::Rect& previous,
@@ skipping 48 matching lines @@
   } else {
     return HTNOWHERE;
   }
 
   // If the window can't be resized, there are no resize boundaries, just
   // window borders.
   return can_resize ? component : HTBORDER;
 }
 
 }  // namespace views