Instant: Use only one hidden WebContents per profile.

chrome/browser/infobars/infobar_container.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 "build/build_config.h"
 
 // TODO(pkasting): Port Mac to use this.
 #if defined(TOOLKIT_VIEWS) || defined(TOOLKIT_GTK)
 
 #include "chrome/browser/infobars/infobar_container.h"
@@ skipping 30 matching lines @@
   // RemoveAllInfoBarsForDestruction() should have already cleared our infobars.
   DCHECK(infobars_.empty());
   if (search_model_)
     search_model_->RemoveObserver(this);
 }
 
 void InfoBarContainer::ChangeInfoBarService(InfoBarService* infobar_service) {
   registrar_.RemoveAll();
 
   // Note that HideAllInfoBars() sets |infobars_shown_| to false, because that's
-  // what the other, instant-related callers want; but here we actually
+  // what the other, Instant-related callers want; but here we actually
   // explicitly want to reset this variable to true.  So do that after calling
   // the function.
   HideAllInfoBars();
   infobars_shown_ = true;
   infobars_shown_time_ = base::TimeTicks();
 
   infobar_service_ = infobar_service;
   if (infobar_service_) {
     content::Source<InfoBarService> source(infobar_service_);
     registrar_.Add(this, chrome::NOTIFICATION_TAB_CONTENTS_INFOBAR_ADDED,
@@ skipping 110 matching lines @@
       NOTREACHED();
       break;
   }
 }
 
 void InfoBarContainer::ModeChanged(const chrome::search::Mode& old_mode,
                                    const chrome::search::Mode& new_mode) {
   // Hide infobars when showing Instant Extended suggestions.
   if (new_mode.is_search_suggestions()) {
     // If suggestions are being shown on a |DEFAULT| page, delay the hiding
-    // until notification that instant preview is ready is received via
-    // PreviewStateChanged(); this prevents jankiness caused by infobars hiding
+    // until notification that Instant overlay is ready is received via
+    // OverlayStateChanged(); this prevents jankiness caused by infobars hiding
     // followed by suggestions appearing.
     if (new_mode.is_origin_default())
       return;
     HideAllInfoBars();
     OnInfoBarStateChanged(false);
   } else {
     ChangeInfoBarService(infobar_service_);
     infobars_shown_time_ = base::TimeTicks::Now();
   }
 }
 
-void InfoBarContainer::PreviewStateChanged(const InstantModel& model) {
-  // If suggestions are being shown on a |DEFAULT| page, hide the infobars now.
+void InfoBarContainer::OverlayStateChanged(const InstantModel& model) {
+  // Suggestions are being shown on a |DEFAULT| page. Hide the infobars now.
   // See comments for ModeChanged() for explanation.
-  if (model.mode().is_search_suggestions() &&
-      model.mode().is_origin_default()) {
+  if (model.overlay()) {
     HideAllInfoBars();
     OnInfoBarStateChanged(false);
   }
 }
 
 size_t InfoBarContainer::HideInfoBar(InfoBarDelegate* delegate,
                                      bool use_animation) {
   bool should_animate = use_animation &&
       ((base::TimeTicks::Now() - infobars_shown_time_) >
           base::TimeDelta::FromMilliseconds(50));
@@ skipping 61 matching lines @@
     return InfoBar::kDefaultArrowTargetHeight;
   // When the first infobar is animating closed, we animate the second infobar's
   // arrow target height from the default to the top target height.  Note that
   // the animation values here are going from 1.0 -> 0.0 as the top bar closes.
   return top_arrow_target_height_ + static_cast<int>(
       (InfoBar::kDefaultArrowTargetHeight - top_arrow_target_height_) *
           first_infobar_animation.GetCurrentValue());
 }
 
 #endif  // TOOLKIT_VIEWS || defined(TOOLKIT_GTK)