Revert 85666 - Consolidate ShouldUseNativeFrame/AlwaysUseNativeFrame/UseNativeFrame spaghetti.

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

 // 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.
 
 #include "chrome/browser/ui/views/frame/app_panel_browser_frame_view.h"
 
 #include "base/compiler_specific.h"
 #include "base/utf_string_conversions.h"
 #include "chrome/browser/ui/views/frame/browser_frame.h"
 #include "chrome/browser/ui/views/frame/browser_view.h"
@@ skipping 47 matching lines @@
                                                    BrowserView* browser_view)
     : BrowserNonClientFrameView(),
       ALLOW_THIS_IN_INITIALIZER_LIST(
           close_button_(new views::ImageButton(this))),
       window_icon_(NULL),
       frame_(frame),
       browser_view_(browser_view) {
   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));
   close_button_->SetImage(views::CustomButton::BS_HOT,
                           rb.GetBitmapNamed(IDR_CLOSE_BAR_H));
   close_button_->SetImage(views::CustomButton::BS_PUSHED,
                           rb.GetBitmapNamed(IDR_CLOSE_BAR_P));
   close_button_->SetAccessibleName(
       l10n_util::GetStringUTF16(IDS_ACCNAME_CLOSE));
   AddChildView(close_button_);
@@ skipping 39 matching lines @@
   return min_size;
 }
 
 ///////////////////////////////////////////////////////////////////////////////
 // AppPanelBrowserFrameView, views::NonClientFrameView implementation:
 
 gfx::Rect AppPanelBrowserFrameView::GetBoundsForClientView() const {
   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();
   int border_thickness = NonClientBorderThickness();
   return gfx::Rect(std::max(0, client_bounds.x() - border_thickness),
                    std::max(0, client_bounds.y() - top_height),
                    client_bounds.width() + (2 * border_thickness),
                    client_bounds.height() + top_height + border_thickness);
 }
 
@@ skipping 356 matching lines @@
 }
 
 gfx::Rect AppPanelBrowserFrameView::CalculateClientAreaBounds(int width,
     int height) const {
   int top_height = NonClientTopBorderHeight();
   int border_thickness = NonClientBorderThickness();
   return gfx::Rect(border_thickness, top_height,
                    std::max(0, width - (2 * border_thickness)),
                    std::max(0, height - top_height - border_thickness));
 }