Immersive mode reveals the tabstrip/omnibox on top of web content

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

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 c2b4258b4c7886eed2f9cf9022bd1409e2a9e513..0747590ea25badd9056e86c214f4560fa7674719 100644
--- a/chrome/browser/ui/views/frame/browser_view.cc
+++ b/chrome/browser/ui/views/frame/browser_view.cc
@@ -176,6 +176,10 @@ const int kNewtabBarRoundness = 5;
 
 // Returned from BrowserView::GetClassName.
 const char BrowserView::kViewClassName[] = "browser/ui/views/BrowserView";
+// static
+const int BrowserView::kTabstripIndex = 0;
+const int BrowserView::kInfoBarIndex = 1;
+const int BrowserView::kToolbarIndex = 2;
 
 namespace {
 
@@ -532,6 +536,9 @@ BrowserView::~BrowserView() {
   launcher_item_controller_.reset();
 #endif
 
+  // Immersive mode may need to reparent views before they are removed/deleted.
+  immersive_mode_controller_.reset();
+
   preview_controller_.reset();
 
   browser_->tab_strip_model()->RemoveObserver(this);
@@ -2162,19 +2169,19 @@ void BrowserView::Init() {
       new BrowserTabStripController(browser_.get(),
                                     browser_->tab_strip_model());
   tabstrip_ = new TabStrip(tabstrip_controller);
-  AddChildView(tabstrip_);
+  AddChildViewAt(tabstrip_, kTabstripIndex);
   tabstrip_controller->InitFromModel(tabstrip_);
 
   infobar_container_ = new InfoBarContainerView(this,
                                                 browser()->search_model());
-  AddChildView(infobar_container_);
+  AddChildViewAt(infobar_container_, kInfoBarIndex);
 
   contents_container_ = new views::WebView(browser_->profile());
   contents_container_->set_id(VIEW_ID_TAB_CONTAINER);
   contents_ = new ContentsContainer(contents_container_);
 
   toolbar_ = new ToolbarView(browser_.get());
-  AddChildView(toolbar_);
+  AddChildViewAt(toolbar_, kToolbarIndex);
   toolbar_->Init();
 
   preview_controller_.reset(