Instant: Use only one hidden WebContents per profile.

chrome/browser/ui/views/frame/browser_view_layout.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_layout.h"
 
 #include "chrome/browser/profiles/profile.h"
 #include "chrome/browser/ui/browser_finder.h"
 #include "chrome/browser/ui/find_bar/find_bar.h"
 #include "chrome/browser/ui/find_bar/find_bar_controller.h"
@@ skipping 242 matching lines @@
 
 void BrowserViewLayout::ViewRemoved(views::View* host, views::View* view) {
   switch (view->id()) {
     case VIEW_ID_BOOKMARK_BAR:
       active_bookmark_bar_ = NULL;
       break;
   }
 }
 
 void BrowserViewLayout::Layout(views::View* host) {
-  // Showing instant extended suggestions causes us to temporarily hide any
+  // Showing Instant extended suggestions causes us to temporarily hide any
   // visible bookmark bar and infobars.  In turn, this hiding would normally
   // cause the content below the suggestions to shift upwards, which looks
   // surprising (since from the user's perspective, we're "covering" rather than
   // "removing" the bookmark bar/infobars).  To prevent this, we save off the
   // content origin here, then once we finish laying things out, force the
   // contents to continue to display from that origin.
   const chrome::search::Mode& mode = browser()->search_model()->mode();
   views::WebView* contents = browser_view_->contents_container_;
-  int preview_height = contents_container_->preview_height();
+  int overlay_height = contents_container_->overlay_height();
   gfx::Point old_contents_origin;
-  if (preview_height > 0 && mode.is_search_suggestions() &&
+  if (overlay_height > 0 && mode.is_search_suggestions() &&
       mode.is_origin_default()) {
     old_contents_origin = contents->bounds().origin();
     views::View::ConvertPointToTarget(contents->parent(), browser_view_,
                                       &old_contents_origin);
   }
 
   vertical_layout_rect_ = browser_view_->GetLocalBounds();
   int top = LayoutTabStripRegion();
   if (browser_view_->IsTabStripVisible()) {
     int x = browser_view_->tabstrip_->GetMirroredX() +
@@ skipping 22 matching lines @@
   if (active_top_margin == 0 && !old_contents_origin.IsOrigin()) {
     gfx::Point new_contents_origin(contents->bounds().origin());
     views::View::ConvertPointToTarget(contents->parent(), browser_view_,
                                       &new_contents_origin);
     active_top_margin = old_contents_origin.y() - new_contents_origin.y();
     // Special case: While normally the suggestions appear to "cover" any
     // bookmark/infobars, if the suggestions are very short, they might not
     // fully cover that gap, and leaving the contents at their original height
     // would leave an odd-looking blank space.  In this case, we allow the
     // contents to go ahead and shift upward.
-    if (active_top_margin > 0 && active_top_margin < preview_height)
+    if (active_top_margin > 0 && active_top_margin < overlay_height)
       contents_container_->SetActiveTopMargin(active_top_margin);
   }
 
   // This must be done _after_ we lay out the WebContents since this
   // code calls back into us to find the bounding box the find bar
   // must be laid out within, and that code depends on the
   // TabContentsContainer's bounds being up to date.
   if (browser()->HasFindBarController()) {
     browser()->GetFindBarController()->find_bar()->MoveWindowIfNecessary(
         gfx::Rect(), true);
@@ skipping 206 matching lines @@
   }
   return bottom;
 }
 
 bool BrowserViewLayout::InfobarVisible() const {
   views::View* infobar_container = browser_view_->infobar_container_;
   // NOTE: Can't check if the size IsEmpty() since it's always 0-width.
   return browser()->SupportsWindowFeature(Browser::FEATURE_INFOBAR) &&
       (infobar_container->GetPreferredSize().height() != 0);
 }