Adds LocationBarContainer that contains

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 35 matching lines @@
 #include "chrome/browser/ui/views/avatar_menu_bubble_view.h"
 #include "chrome/browser/ui/views/avatar_menu_button.h"
 #include "chrome/browser/ui/views/bookmarks/bookmark_bar_view.h"
 #include "chrome/browser/ui/views/browser_dialogs.h"
 #include "chrome/browser/ui/views/download/download_in_progress_dialog_view.h"
 #include "chrome/browser/ui/views/download/download_shelf_view.h"
 #include "chrome/browser/ui/views/frame/browser_view_layout.h"
 #include "chrome/browser/ui/views/frame/contents_container.h"
 #include "chrome/browser/ui/views/fullscreen_exit_bubble_views.h"
 #include "chrome/browser/ui/views/infobars/infobar_container_view.h"
+#include "chrome/browser/ui/views/location_bar/location_bar_container.h"
 #include "chrome/browser/ui/views/location_bar/location_icon_view.h"
 #include "chrome/browser/ui/views/omnibox/omnibox_view_views.h"
 #include "chrome/browser/ui/views/password_generation_bubble_view.h"
 #include "chrome/browser/ui/views/status_bubble_views.h"
 #include "chrome/browser/ui/views/tabs/browser_tab_strip_controller.h"
 #include "chrome/browser/ui/views/tabs/tab_strip.h"
 #include "chrome/browser/ui/views/toolbar_view.h"
 #include "chrome/browser/ui/views/update_recommended_message_box.h"
 #include "chrome/browser/ui/views/website_settings_popup_view.h"
 #include "chrome/browser/ui/webui/feedback_ui.h"
@@ skipping 1214 matching lines @@
                             true, false, false, false);
 }
 
 void BrowserView::ShowInstant(TabContents* preview) {
   if (!preview_container_) {
     preview_container_ = new views::WebView(browser_->profile());
     preview_container_->set_id(VIEW_ID_TAB_CONTAINER);
   }
   contents_->SetPreview(preview_container_, preview->web_contents());
   preview_container_->SetWebContents(preview->web_contents());
+  RestackLocationBarContainer();
 }
 
 void BrowserView::HideInstant() {
   if (!preview_container_)
     return;
 
   // The contents must be changed before SetPreview is invoked.
   preview_container_->SetWebContents(NULL);
   contents_->SetPreview(NULL, NULL);
   delete preview_container_;
@@ skipping 580 matching lines @@
 
 #if defined(OS_WIN) && !defined(USE_AURA)
   // Create a custom JumpList and add it to an observer of TabRestoreService
   // so we can update the custom JumpList when a tab is added or removed.
   if (JumpList::Enabled()) {
     jumplist_ = new JumpList();
     jumplist_->AddObserver(browser_->profile());
   }
 #endif
 
+  ReorderChildView(toolbar_->location_bar_container(), child_count() - 1);
+
   // We're now initialized and ready to process Layout requests.
   ignore_layout_ = false;
 }
 
 void BrowserView::LoadingAnimationCallback() {
   base::TimeTicks now = base::TimeTicks::Now();
   if (!last_animation_time_.is_null()) {
     UMA_HISTOGRAM_TIMES(
         "Tabs.LoadingAnimationTime",
         now - last_animation_time_);
@@ skipping 71 matching lines @@
     TabContents* devtools_tab_contents =
         DevToolsWindow::GetDevToolsContents(tab_contents->web_contents());
     if (devtools_tab_contents)
       devtools_contents = devtools_tab_contents->web_contents();
   }
 
   bool should_show = devtools_contents && !devtools_container_->visible();
   bool should_hide = !devtools_contents && devtools_container_->visible();
 
   devtools_container_->SetWebContents(devtools_contents);
+  RestackLocationBarContainer();
 
   if (should_show)
     ShowDevToolsContainer();
   else if (should_hide)
     HideDevToolsContainer();
 }
 
 void BrowserView::ShowDevToolsContainer() {
   if (!devtools_focus_tracker_.get()) {
     // Install devtools focus tracker when dev tools window is shown for the
@@ skipping 373 matching lines @@
   // avoid an unnecessary resize and re-layout of a WebContents.
   if (change_tab_contents)
     contents_container_->SetWebContents(NULL);
   infobar_container_->ChangeTabContents(new_contents->infobar_tab_helper());
   if (bookmark_bar_view_.get()) {
     bookmark_bar_view_->SetBookmarkBarState(
         browser_->bookmark_bar_state(),
         BookmarkBar::DONT_ANIMATE_STATE_CHANGE);
   }
   UpdateUIForContents(new_contents);
-  if (change_tab_contents)
+  if (change_tab_contents) {
     contents_container_->SetWebContents(new_contents->web_contents());
+    RestackLocationBarContainer();
+  }
 
   UpdateDevToolsForContents(new_contents);
   // TODO(beng): This should be called automatically by ChangeWebContents, but I
   //             am striving for parity now rather than cleanliness. This is
   //             required to make features like Duplicate Tab, Undo Close Tab,
   //             etc not result in sad tab.
   new_contents->web_contents()->DidBecomeSelected();
   if (!browser_->tab_strip_model()->closing_all() && GetWidget()->IsActive() &&
       GetWidget()->IsVisible()) {
     // We only restore focus if our window is visible, to avoid invoking blur
@@ skipping 12 matching lines @@
 }
 
 void BrowserView::SetToolbar(ToolbarView* toolbar) {
   if (toolbar_) {
     RemoveChildView(toolbar_);
     delete toolbar_;
   }
   toolbar_ = toolbar;
   if (toolbar) {
     AddChildView(toolbar_);
-    toolbar_->Init(contents_->header());
+    toolbar_->Init(this, 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();
 }
+
+void BrowserView::RestackLocationBarContainer() {
+  toolbar_->location_bar_container()->StackAtTop();
+}