Revert 85666 - Consolidate ShouldUseNativeFrame/AlwaysUseNativeFrame/UseNativeFrame spaghetti.

chrome/browser/ui/views/frame/browser_frame.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 CHROME_BROWSER_UI_VIEWS_FRAME_BROWSER_FRAME_H_
 #define CHROME_BROWSER_UI_VIEWS_FRAME_BROWSER_FRAME_H_
 #pragma once
 
 #include "base/compiler_specific.h"
 #include "base/logging.h"
@@ skipping 43 matching lines @@
   gfx::Rect GetBoundsForTabStrip(views::View* tabstrip) const;
 
   // Returns the y coordinate within the window at which the horizontal TabStrip
   // begins (or would begin).  If |restored| is true, this is calculated as if
   // we were in restored mode regardless of the current mode.
   int GetHorizontalTabStripVerticalOffset(bool restored) const;
 
   // Tells the frame to update the throbber.
   void UpdateThrobber(bool running);
 
+  // Returns true if the window should use the native frame view. This is true
+  // if there are no themes applied on Vista, or if there are themes applied and
+  // this browser window is an app or popup.
+  bool AlwaysUseNativeFrame() const;
+
   // Returns the NonClientFrameView of this frame.
   views::View* GetFrameView() const;
 
   // Notifies the frame that the tab strip display mode changed so it can update
   // its frame treatment if necessary.
   void TabStripDisplayModeChanged();
 
   // Overridden from views::Window:
   virtual bool IsMaximized() const OVERRIDE;
   virtual views::RootView* CreateRootView() OVERRIDE;
@@ skipping 14 matching lines @@
   // A pointer to our NonClientFrameView as a BrowserNonClientFrameView.
   BrowserNonClientFrameView* browser_frame_view_;
 
   // The BrowserView is our ClientView. This is a pointer to it.
   BrowserView* browser_view_;
 
   DISALLOW_COPY_AND_ASSIGN(BrowserFrame);
 };
 
 #endif  // CHROME_BROWSER_UI_VIEWS_FRAME_BROWSER_FRAME_H_