Adds ability to render omnibox as a view above the page.

chrome/browser/ui/views/frame/browser_view.cc

 // Copyright (c) 2012 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/views/frame/browser_view.h"
 
 #include <algorithm>
 
 #include "base/auto_reset.h"
 #include "base/command_line.h"
@@ skipping 1797 matching lines @@
 #endif
   }
 
   return otr_resource_id;
 }
 
 views::LayoutManager* BrowserView::CreateLayoutManager() const {
   return new BrowserViewLayout;
 }
 
-ToolbarView* BrowserView::CreateToolbar() const {
-  return new ToolbarView(browser_.get());
-}
-
 void BrowserView::Init() {
   GetWidget()->AddObserver(this);
 
   SetLayoutManager(CreateLayoutManager());
   // Stow a pointer to this object onto the window handle so that we can get at
   // it later when all we have is a native view.
   GetWidget()->SetNativeWindowProperty(kBrowserViewKey, this);
 
   // Stow a pointer to the browser's profile onto the window handle so that we
   // can get it later when all we have is a native view.
@@ skipping 10 matching lines @@
   LoadAccelerators();
 
   // TabStrip takes ownership of the controller.
   BrowserTabStripController* tabstrip_controller =
       new BrowserTabStripController(browser_.get(),
                                     browser_->tab_strip_model());
   tabstrip_ = new TabStrip(tabstrip_controller);
   AddChildView(tabstrip_);
   tabstrip_controller->InitFromModel(tabstrip_);
 
-  SetToolbar(CreateToolbar());
-
   infobar_container_ = new InfoBarContainerView(this);
   AddChildView(infobar_container_);
 
   contents_container_ = new views::WebView(browser_->profile());
   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);
 
   devtools_container_ = new views::WebView(browser_->profile());
   devtools_container_->set_id(VIEW_ID_DEV_TOOLS_DOCKED);
   devtools_container_->SetVisible(false);
 
   views::View* contents_view = contents_;
 
   contents_split_ = new views::SingleSplitView(
@@ skipping 531 matching lines @@
 }
 
 void BrowserView::SetToolbar(ToolbarView* toolbar) {
   if (toolbar_) {
     RemoveChildView(toolbar_);
     delete toolbar_;
   }
   toolbar_ = toolbar;
   if (toolbar) {
     AddChildView(toolbar_);
-    toolbar_->Init();
+    toolbar_->Init(contents_->header());
   }
 }
 
 void BrowserView::CreateLauncherIcon() {
 #if defined(USE_ASH)
   if (browser::IsNativeWindowInAsh(GetNativeWindow()) &&
       !launcher_item_controller_.get()) {
     launcher_item_controller_.reset(
         BrowserLauncherItemController::Create(browser_.get()));
   }
@@ skipping 51 matching lines @@
           this,
           tab_contents->web_contents()->GetRenderViewHost(),
           password_generator,
           browser_.get(),
           tab_contents->password_manager());
 
   views::BubbleDelegateView::CreateBubble(bubble);
   bubble->SetAlignment(views::BubbleBorder::ALIGN_ARROW_TO_MID_ANCHOR);
   bubble->Show();
 }