Re-land:

chrome/browser/chromeos/frame/browser_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/chromeos/frame/browser_view.h"
 
 #include <algorithm>
 #include <string>
 #include <vector>
 
@@ skipping 222 matching lines @@
 // BrowserView, ::BrowserView overrides:
 
 void BrowserView::Init() {
   ::BrowserView::Init();
   status_area_ = new StatusAreaView(this);
   status_area_->SetID(VIEW_ID_STATUS_AREA);
   AddChildView(status_area_);
   status_area_->Init();
   InitSystemMenu();
 
-  // The ContextMenuController has to be set to a NonClientView but
-  // not to a NonClientFrameView because a TabStrip is not a child of
-  // a NonClientFrameView even though visually a TabStrip is over a
-  // NonClientFrameView.
-  BrowserFrameGtk* gtk_frame = static_cast<BrowserFrameGtk*>(frame());
-  gtk_frame->non_client_view()->SetContextMenuController(this);
+  frame()->non_client_view()->SetContextMenuController(this);
 
   // Listen to wrench menu opens.
   if (toolbar())
     toolbar()->AddMenuListener(this);
 
   // Make sure the window is set to the right type.
   std::vector<int> params;
   params.push_back(browser()->tab_count());
   params.push_back(browser()->active_index());
   params.push_back(gtk_get_current_event_time());
   WmIpc::instance()->SetWindowType(
-      GTK_WIDGET(frame()->GetWindow()->GetNativeWindow()),
+      GTK_WIDGET(frame()->GetNativeWindow()),
       WM_IPC_WINDOW_CHROME_TOPLEVEL,
       &params);
 }
 
 void BrowserView::Show() {
   ShowInternal(true);
 }
 
 void BrowserView::ShowInactive() {
   ShowInternal(false);
 }
 
 void BrowserView::ShowInternal(bool is_active) {
-  bool was_visible = frame()->GetWindow()->IsVisible();
+  bool was_visible = frame()->IsVisible();
   if (is_active)
     ::BrowserView::Show();
   else
     ::BrowserView::ShowInactive();
   if (!was_visible) {
     // Have to update the tab count and selected index to reflect reality.
     std::vector<int> params;
     params.push_back(browser()->tab_count());
     params.push_back(browser()->active_index());
     WmIpc::instance()->SetWindowType(
-        GTK_WIDGET(frame()->GetWindow()->GetNativeWindow()),
+        GTK_WIDGET(frame()->GetNativeWindow()),
         WM_IPC_WINDOW_CHROME_TOPLEVEL,
         &params);
   }
 }
 
 void BrowserView::FocusChromeOSStatus() {
   SaveFocusedView();
   status_area_->SetPaneFocus(last_focused_view_storage_id(), NULL);
 }
 
@@ skipping 132 matching lines @@
 }  // namespace chromeos
 
 // static
 BrowserWindow* BrowserWindow::CreateBrowserWindow(Browser* browser) {
   // Create a browser view for chromeos.
   BrowserView* view;
   if (browser->is_type_popup() || browser->is_type_panel())
     view = new chromeos::PanelBrowserView(browser);
   else
     view = new chromeos::BrowserView(browser);
-  BrowserFrame::Create(view, browser->profile());
+  (new BrowserFrame(view))->InitBrowserFrame();
   return view;
 }