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

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

 // Copyright 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 158 matching lines @@
 // The amount of space we expect the window border to take up.
 const int kWindowBorderWidth = 5;
 
 // How round the 'new tab' style bookmarks bar is.
 const int kNewtabBarRoundness = 5;
 
 }  // namespace
 
 // 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 {
 
 bool ShouldSaveOrRestoreWindowPos() {
 #if defined(OS_WIN) && !defined(USE_AURA)
   // In Windows 8 metro mode the window is always maximized (without the
   // WS_MAXIMIZE) style.
   if (base::win::IsMetroProcess())
     return false;
 #endif
@@ skipping 336 matching lines @@
   browser_->tab_strip_model()->AddObserver(this);
 }
 
 BrowserView::~BrowserView() {
 #if defined(USE_ASH)
   // Destroy BrowserLauncherItemController early on as it listens to the
   // TabstripModel, which is destroyed by the browser.
   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);
 
 #if defined(OS_WIN) && !defined(USE_AURA)
   // Stop hung plugin monitoring.
   ticker_.Stop();
   ticker_.UnregisterTickHandler(&hung_window_detector_);
 
   // Terminate the jumplist (must be called before browser_->profile() is
@@ skipping 1610 matching lines @@
     InitHangMonitor();
   }
 
   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_);
+  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(
       new InstantPreviewControllerViews(browser(), contents_));
 
   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);
@@ skipping 593 matching lines @@
     modal_browser->window()->Activate();
   }
 
   AppModalDialogQueue::GetInstance()->ActivateModalDialog();
 }
 
 void BrowserView::MaybeStackBookmarkBarAtTop() {
   if (bookmark_bar_view_.get())
     bookmark_bar_view_->MaybeStackAtTop();
 }