Re-land:

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 206 matching lines @@
 
 bool PanelBrowserFrameView::AlwaysUseNativeFrame() const {
   return frame_->AlwaysUseNativeFrame();
 }
 
 int PanelBrowserFrameView::NonClientHitTest(const gfx::Point& point) {
   if (!bounds().Contains(point))
     return HTNOWHERE;
 
   int frame_component =
-      frame_->GetWindow()->client_view()->NonClientHitTest(point);
+      frame_->client_view()->NonClientHitTest(point);
   if (frame_component != HTNOWHERE)
     return frame_component;
 
   if (close_button_->IsVisible() &&
       close_button_->GetMirroredBounds().Contains(point))
     return HTCLOSE;
 
   int window_component = GetHTComponentForFrame(point,
       NonClientBorderThickness(), NonClientBorderThickness(),
       0, 0,
-      frame_->GetWindow()->window_delegate()->CanResize());
+      frame_->window_delegate()->CanResize());
   // Fall back to the caption if no other component matches.
   return (window_component == HTNOWHERE) ? HTCAPTION : window_component;
 }
 
 void PanelBrowserFrameView::GetWindowMask(const gfx::Size& size,
                                           gfx::Path* window_mask) {
   views::GetDefaultWindowMask(size, window_mask);
 }
 
 void PanelBrowserFrameView::EnableClose(bool enable) {
@@ skipping 84 matching lines @@
 
 void PanelBrowserFrameView::OnMouseReleased(const views::MouseEvent& event) {
   if (browser_view_->OnTitleBarMouseReleased(event))
     return;
   BrowserNonClientFrameView::OnMouseReleased(event);
 }
 
 void PanelBrowserFrameView::ButtonPressed(views::Button* sender,
                                           const views::Event& event) {
   if (sender == close_button_)
-    frame_->GetWindow()->CloseWindow();
+    frame_->Close();
 }
 
 void PanelBrowserFrameView::RunMenu(View* source, const gfx::Point& pt) {
   CreateOrUpdateOptionsMenu();
   options_menu_->RunMenuAt(pt, views::Menu2::ALIGN_TOPRIGHT);
 }
 
 bool PanelBrowserFrameView::IsCommandIdChecked(int command_id) const {
   // Nothing in the menu is checked.
   return false;
@@ skipping 31 matching lines @@
 
 bool PanelBrowserFrameView::ShouldTabIconViewAnimate() const {
   // This function is queried during the creation of the window as the
   // TabIconView we host is initialized, so we need to NULL check the selected
   // TabContents because in this condition there is not yet a selected tab.
   TabContents* current_tab = browser_view_->GetSelectedTabContents();
   return current_tab ? current_tab->is_loading() : false;
 }
 
 SkBitmap PanelBrowserFrameView::GetFaviconForTabIconView() {
-  return frame_->GetWindow()->window_delegate()->GetWindowIcon();
+  return frame_->window_delegate()->GetWindowIcon();
 }
 
 int PanelBrowserFrameView::NonClientBorderThickness() const {
   return kFrameBorderThickness + kClientEdgeThickness;
 }
 
 int PanelBrowserFrameView::NonClientTopBorderHeight() const {
   return kFrameBorderThickness + kTitleBarHeight + kClientEdgeThickness;
 }
 
@@ skipping 101 matching lines @@
 
   // Draw the left edge.
   canvas->TileImageInt(
       *(client_edges.left),
       client_view_bounds_.x() - client_edges.left->width(),
       client_area_top, client_edges.left->width(), client_area_height);
 }
 
 void PanelBrowserFrameView::UpdateTitleBar() {
   title_label_->SetText(
-      frame_->GetWindow()->window_delegate()->GetWindowTitle());
+      frame_->window_delegate()->GetWindowTitle());
 }
 
 void PanelBrowserFrameView::OnActivationChanged(bool active) {
   SchedulePaint();
 }
 
 void PanelBrowserFrameView::CreateOrUpdateOptionsMenu() {
   bool rebuild_menu = CreateOrUpdateOptionsMenuItems();
   if (options_menu_.get()) {
     if (rebuild_menu)
@@ skipping 45 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;
 }