| Index: chrome/browser/ui/views/frame/browser_view.cc | 
| diff --git a/chrome/browser/ui/views/frame/browser_view.cc b/chrome/browser/ui/views/frame/browser_view.cc | 
| index 12bc6c4c3c06266cdda85877d5b75803623a18f6..fb79fc8fa343de487404a29e6b311d367d3392ea 100644 | 
| --- a/chrome/browser/ui/views/frame/browser_view.cc | 
| +++ b/chrome/browser/ui/views/frame/browser_view.cc | 
| @@ -1815,10 +1815,6 @@ views::LayoutManager* BrowserView::CreateLayoutManager() const { | 
| return new BrowserViewLayout; | 
| } | 
|  | 
| -ToolbarView* BrowserView::CreateToolbar() const { | 
| -  return new ToolbarView(browser_.get()); | 
| -} | 
| - | 
| void BrowserView::Init() { | 
| GetWidget()->AddObserver(this); | 
|  | 
| @@ -1849,8 +1845,6 @@ void BrowserView::Init() { | 
| AddChildView(tabstrip_); | 
| tabstrip_controller->InitFromModel(tabstrip_); | 
|  | 
| -  SetToolbar(CreateToolbar()); | 
| - | 
| infobar_container_ = new InfoBarContainerView(this); | 
| AddChildView(infobar_container_); | 
|  | 
| @@ -1858,6 +1852,8 @@ void BrowserView::Init() { | 
| contents_container_->set_id(VIEW_ID_TAB_CONTAINER); | 
| contents_ = new ContentsContainer(contents_container_); | 
|  | 
| +  SetToolbar(new ToolbarView(browser_.get())); | 
| + | 
| SkColor bg_color = GetWidget()->GetThemeProvider()-> | 
| GetColor(ThemeService::COLOR_TOOLBAR); | 
|  | 
| @@ -2409,7 +2405,7 @@ void BrowserView::SetToolbar(ToolbarView* toolbar) { | 
| toolbar_ = toolbar; | 
| if (toolbar) { | 
| AddChildView(toolbar_); | 
| -    toolbar_->Init(); | 
| +    toolbar_->Init(contents_->header()); | 
| } | 
| } | 
|  | 
|  |