Revert 85666 - Consolidate ShouldUseNativeFrame/AlwaysUseNativeFrame/UseNativeFrame spaghetti.

views/window/non_client_view.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 "views/window/non_client_view.h"
 
 #include "ui/base/accessibility/accessible_view_state.h"
 #include "views/widget/root_view.h"
 #include "views/widget/widget.h"
 #include "views/window/client_view.h"
@@ skipping 48 matching lines @@
 }
 
 void NonClientView::UpdateFrame() {
   SetFrameView(frame_->CreateFrameViewForWindow());
   GetWidget()->ThemeChanged();
   Layout();
   SchedulePaint();
   frame_->UpdateFrameAfterFrameChange();
 }
 
+bool NonClientView::UseNativeFrame() const {
+  if (frame_view_.get()) {
+    // The frame view may always require a native frame, e.g. popups on Vista+
+    // when themes are active.
+    if (frame_view_->AlwaysUseNativeFrame())
+      return true;
+
+    // The frame view may always require a custom frame, e.g. Constrained
+    // Windows.
+    if (frame_view_->AlwaysUseCustomFrame())
+      return false;
+  }
+  return frame_->ShouldUseNativeFrame();
+}
+
 void NonClientView::DisableInactiveRendering(bool disable) {
   frame_view_->DisableInactiveRendering(disable);
 }
 
 gfx::Rect NonClientView::GetWindowBoundsForClientBounds(
     const gfx::Rect client_bounds) const {
   return frame_view_->GetWindowBoundsForClientBounds(client_bounds);
 }
 
 int NonClientView::NonClientHitTest(const gfx::Point& point) {
@@ skipping 91 matching lines @@
   View::ConvertPointToView(this, frame_view_.get(), &point_in_child_coords);
   if (frame_view_->HitTest(point_in_child_coords))
     return frame_view_->GetEventHandlerForPoint(point_in_child_coords);
 
   return View::GetEventHandlerForPoint(point);
 }
 
 ////////////////////////////////////////////////////////////////////////////////
 // NonClientFrameView, View overrides:
 
+bool NonClientFrameView::AlwaysUseCustomFrame() const {
+  return false;
+}
+
+bool NonClientFrameView::AlwaysUseNativeFrame() const {
+  return false;
+}
+
 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()->client_view()->bounds().Contains(l);
 }
 
 ////////////////////////////////////////////////////////////////////////////////
 // NonClientFrameView, protected:
 
 int NonClientFrameView::GetHTComponentForFrame(const gfx::Point& point,
@@ skipping 52 matching lines @@
 void NonClientFrameView::GetAccessibleState(ui::AccessibleViewState* state) {
   state->role = ui::AccessibilityTypes::ROLE_WINDOW;
 }
 
 void NonClientFrameView::OnBoundsChanged(const gfx::Rect& previous_bounds) {
   // Overridden to do nothing. The NonClientView manually calls Layout on the
   // FrameView when it is itself laid out, see comment in NonClientView::Layout.
 }
 
 }  // namespace views