Revert 85666 - Consolidate ShouldUseNativeFrame/AlwaysUseNativeFrame/UseNativeFrame spaghetti.

chrome/browser/ui/views/frame/browser_frame.h

Index: chrome/browser/ui/views/frame/browser_frame.h
===================================================================
--- chrome/browser/ui/views/frame/browser_frame.h	(revision 85701)
+++ chrome/browser/ui/views/frame/browser_frame.h	(working copy)
@@ -61,6 +61,11 @@
   // 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;