Re-land:

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 85284)
+++ chrome/browser/ui/panels/panel_browser_frame_view.cc	(working copy)
@@ -224,7 +224,7 @@
     return HTNOWHERE;
 
   int frame_component =
-      frame_->GetWindow()->client_view()->NonClientHitTest(point);
+      frame_->client_view()->NonClientHitTest(point);
   if (frame_component != HTNOWHERE)
     return frame_component;
 
@@ -235,7 +235,7 @@
   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;
 }
@@ -340,7 +340,7 @@
 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) {
@@ -392,7 +392,7 @@
 }
 
 SkBitmap PanelBrowserFrameView::GetFaviconForTabIconView() {
-  return frame_->GetWindow()->window_delegate()->GetWindowIcon();
+  return frame_->window_delegate()->GetWindowIcon();
 }
 
 int PanelBrowserFrameView::NonClientBorderThickness() const {
@@ -514,7 +514,7 @@
 
 void PanelBrowserFrameView::UpdateTitleBar() {
   title_label_->SetText(
-      frame_->GetWindow()->window_delegate()->GetWindowTitle());
+      frame_->window_delegate()->GetWindowTitle());
 }
 
 void PanelBrowserFrameView::OnActivationChanged(bool active) {