Re-land:

chrome/browser/chromeos/frame/browser_view.cc

Index: chrome/browser/chromeos/frame/browser_view.cc
===================================================================
--- chrome/browser/chromeos/frame/browser_view.cc	(revision 85284)
+++ chrome/browser/chromeos/frame/browser_view.cc	(working copy)
@@ -240,12 +240,7 @@
   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())
@@ -257,7 +252,7 @@
   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);
 }
@@ -271,7 +266,7 @@
 }
 
 void BrowserView::ShowInternal(bool is_active) {
-  bool was_visible = frame()->GetWindow()->IsVisible();
+  bool was_visible = frame()->IsVisible();
   if (is_active)
     ::BrowserView::Show();
   else
@@ -282,7 +277,7 @@
     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);
   }
@@ -435,6 +430,6 @@
     view = new chromeos::PanelBrowserView(browser);
   else
     view = new chromeos::BrowserView(browser);
-  BrowserFrame::Create(view, browser->profile());
+  (new BrowserFrame(view))->InitBrowserFrame();
   return view;
 }