Revert 85666 - Consolidate ShouldUseNativeFrame/AlwaysUseNativeFrame/UseNativeFrame spaghetti.

chrome/browser/ui/panels/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/panels/panel_browser_frame_view.h"
 
 #include "chrome/browser/themes/theme_service.h"
 #include "chrome/browser/ui/panels/panel.h"
 #include "chrome/browser/ui/panels/panel_browser_view.h"
 #include "chrome/browser/ui/panels/panel_manager.h"
@@ skipping 123 matching lines @@
                                              PanelBrowserView* browser_view)
     : BrowserNonClientFrameView(),
       frame_(frame),
       browser_view_(browser_view),
       paint_state_(NOT_PAINTED),
       options_button_(NULL),
       close_button_(NULL),
       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));
   options_button_->SetHoverIcon(*(options_button_resources.hover_image));
   options_button_->SetPushedIcon(*(options_button_resources.pushed_image));
   options_button_->set_alignment(views::TextButton::ALIGN_CENTER);
   options_button_->set_border(NULL);
   // TODO(jianli): Hide options button by default and show it when mouse is over
   // panel.
   // options_button_->SetVisible(false);
@@ skipping 40 matching lines @@
 void PanelBrowserFrameView::UpdateThrobber(bool running) {
   // Tells the title icon to update the throbber when we need to show the
   // animation to indicate we're still loading.
   title_icon_->Update();
 }
 
 gfx::Rect PanelBrowserFrameView::GetBoundsForClientView() const {
   return client_view_bounds_;
 }
 
+bool PanelBrowserFrameView::AlwaysUseCustomFrame() const {
+  return true;
+}
+
 gfx::Rect PanelBrowserFrameView::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);
 }
 
+bool PanelBrowserFrameView::AlwaysUseNativeFrame() const {
+  return frame_->AlwaysUseNativeFrame();
+}
+
 int PanelBrowserFrameView::NonClientHitTest(const gfx::Point& point) {
   if (!bounds().Contains(point))
     return HTNOWHERE;
 
   int frame_component =
       frame_->client_view()->NonClientHitTest(point);
   if (frame_component != HTNOWHERE)
     return frame_component;
 
   if (close_button_->IsVisible() &&
@@ skipping 341 matching lines @@
         COMMAND_CLOSE_ALL,
         l10n_util::GetStringUTF16(IDS_PANEL_OPTIONS_MENU_CLOSE_ALL));
     options_menu_contents_->AddSeparator();
   }
 
   options_menu_contents_->AddItem(
       COMMAND_ABOUT, l10n_util::GetStringUTF16(IDS_PANEL_OPTIONS_MENU_ABOUT));
 
   return rebuild_menu;
 }