Revert 85666 - Consolidate ShouldUseNativeFrame/AlwaysUseNativeFrame/UseNativeFrame spaghetti.

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

Index: chrome/browser/ui/views/frame/popup_non_client_frame_view.h
===================================================================
--- chrome/browser/ui/views/frame/popup_non_client_frame_view.h	(revision 85701)
+++ chrome/browser/ui/views/frame/popup_non_client_frame_view.h	(working copy)
@@ -13,10 +13,12 @@
 // nothing.
 class PopupNonClientFrameView : public BrowserNonClientFrameView {
  public:
-  explicit PopupNonClientFrameView(BrowserFrame* frame);
+  PopupNonClientFrameView() {}
 
   // NonClientFrameView:
   virtual gfx::Rect GetBoundsForClientView() const OVERRIDE;
+  virtual bool AlwaysUseCustomFrame() const OVERRIDE;
+  virtual bool AlwaysUseNativeFrame() const OVERRIDE;
   virtual gfx::Rect GetWindowBoundsForClientBounds(
       const gfx::Rect& client_bounds) const OVERRIDE;
   virtual int NonClientHitTest(const gfx::Point& point) OVERRIDE;