Revert 85666 - Consolidate ShouldUseNativeFrame/AlwaysUseNativeFrame/UseNativeFrame spaghetti.

views/window/non_client_view.h

 // 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.
 
 #ifndef VIEWS_WINDOW_NON_CLIENT_VIEW_H_
 #define VIEWS_WINDOW_NON_CLIENT_VIEW_H_
 #pragma once
 
 #include "base/task.h"
 #include "views/view.h"
@@ skipping 27 matching lines @@
   void DisableInactiveRendering(bool disable) {
     paint_as_active_ = disable;
     if (!paint_as_active_)
       SchedulePaint();
   }
 
   // Returns the bounds (in this View's parent's coordinates) that the client
   // view should be laid out within.
   virtual gfx::Rect GetBoundsForClientView() const = 0;
 
+  // Returns true if this FrameView should always use the custom frame,
+  // regardless of the system settings. An example is the Constrained Window,
+  // which is a child window and must always provide its own frame.
+  virtual bool AlwaysUseCustomFrame() const;
+
+  // Like AlwaysUseCustomFrame, returns true if this FrameView should always use
+  // the native frame, regardless of theme settings. An example is popup/app
+  // windows, which we do not ever want to show themed.
+  virtual bool AlwaysUseNativeFrame() const;
+
   virtual gfx::Rect GetWindowBoundsForClientBounds(
       const gfx::Rect& client_bounds) const = 0;
 
   // This function must ask the ClientView to do a hittest.  We don't do this in
   // the parent NonClientView because that makes it more difficult to calculate
   // hittests for regions that are partially obscured by the ClientView, e.g.
   // HTSYSMENU.
   virtual int NonClientHitTest(const gfx::Point& point) = 0;
   virtual void GetWindowMask(const gfx::Size& size,
                              gfx::Path* window_mask) = 0;
@@ skipping 86 matching lines @@
   // closed, false otherwise.
   bool CanClose();
 
   // Called by the containing Window when it is closed.
   void WindowClosing();
 
   // Changes the frame from native to custom depending on the value of
   // |use_native_frame|.
   void UpdateFrame();
 
+  // Returns true if the native window frame should be used, false if the
+  // NonClientView provides its own frame implementation.
+  bool UseNativeFrame() const;
+
   // Prevents the window from being rendered as deactivated when |disable| is
   // true, until called with |disable| false. Used when a sub-window is to be
   // shown that shouldn't visually de-activate the window.
   // Subclasses can override this to perform additional actions when this value
   // changes.
   void DisableInactiveRendering(bool disable);
 
   // Returns the bounds of the window required to display the content area at
   // the specified bounds.
   gfx::Rect GetWindowBoundsForClientBounds(const gfx::Rect client_bounds) const;
@@ skipping 64 matching lines @@
 
   // The accessible name of this view.
   string16 accessible_name_;
 
   DISALLOW_COPY_AND_ASSIGN(NonClientView);
 };
 
 }  // namespace views
 
 #endif  // #ifndef VIEWS_WINDOW_NON_CLIENT_VIEW_H_