Revert 85666 - Consolidate ShouldUseNativeFrame/AlwaysUseNativeFrame/UseNativeFrame spaghetti.

chrome/browser/ui/views/frame/app_panel_browser_frame_view.cc

Index: chrome/browser/ui/views/frame/app_panel_browser_frame_view.cc
===================================================================
--- chrome/browser/ui/views/frame/app_panel_browser_frame_view.cc	(revision 85701)
+++ chrome/browser/ui/views/frame/app_panel_browser_frame_view.cc	(working copy)
@@ -65,8 +65,6 @@
   DCHECK(browser_view->ShouldShowWindowIcon());
   DCHECK(browser_view->ShouldShowWindowTitle());
 
-  frame_->set_frame_type(views::Window::FRAME_TYPE_FORCE_CUSTOM);
-
   ResourceBundle& rb = ResourceBundle::GetSharedInstance();
   close_button_->SetImage(views::CustomButton::BS_NORMAL,
                           rb.GetBitmapNamed(IDR_CLOSE_BAR));
@@ -126,6 +124,14 @@
   return client_view_bounds_;
 }
 
+bool AppPanelBrowserFrameView::AlwaysUseCustomFrame() const {
+  return true;
+}
+
+bool AppPanelBrowserFrameView::AlwaysUseNativeFrame() const {
+  return frame_->AlwaysUseNativeFrame();
+}
+
 gfx::Rect AppPanelBrowserFrameView::GetWindowBoundsForClientBounds(
     const gfx::Rect& client_bounds) const {
   int top_height = NonClientTopBorderHeight();