Revert 85666 - Consolidate ShouldUseNativeFrame/AlwaysUseNativeFrame/UseNativeFrame spaghetti.

chrome/browser/ui/panels/panel_browser_frame_view.cc

Index: chrome/browser/ui/panels/panel_browser_frame_view.cc
===================================================================
--- chrome/browser/ui/panels/panel_browser_frame_view.cc	(revision 85701)
+++ chrome/browser/ui/panels/panel_browser_frame_view.cc	(working copy)
@@ -141,7 +141,6 @@
       title_icon_(NULL),
       title_label_(NULL) {
   EnsureResourcesInitialized();
-  frame_->set_frame_type(views::Window::FRAME_TYPE_FORCE_CUSTOM);
 
   options_button_ = new views::MenuButton(NULL, std::wstring(), this, false);
   options_button_->SetIcon(*(options_button_resources.normal_image));
@@ -202,6 +201,10 @@
   return client_view_bounds_;
 }
 
+bool PanelBrowserFrameView::AlwaysUseCustomFrame() const {
+  return true;
+}
+
 gfx::Rect PanelBrowserFrameView::GetWindowBoundsForClientBounds(
     const gfx::Rect& client_bounds) const {
   int top_height = NonClientTopBorderHeight();
@@ -212,6 +215,10 @@
                    client_bounds.height() + top_height + border_thickness);
 }
 
+bool PanelBrowserFrameView::AlwaysUseNativeFrame() const {
+  return frame_->AlwaysUseNativeFrame();
+}
+
 int PanelBrowserFrameView::NonClientHitTest(const gfx::Point& point) {
   if (!bounds().Contains(point))
     return HTNOWHERE;