Instant: Use only one hidden WebContents per profile.

chrome/browser/infobars/infobar_container.cc

-// Copyright (c) 2012 The Chromium Authors. All rights reserved.
+// 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 "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"
 
 #include <algorithm>
 
 #include "base/logging.h"
 #include "chrome/browser/api/infobars/infobar_delegate.h"
 #include "chrome/browser/api/infobars/infobar_service.h"
 #include "chrome/browser/infobars/infobar.h"
-#include "chrome/browser/instant/instant_overlay_model.h"
 #include "chrome/browser/ui/search/search_model.h"
 #include "chrome/common/chrome_notification_types.h"
 #include "content/public/browser/notification_details.h"
 #include "content/public/browser/notification_source.h"
 #include "ui/base/animation/slide_animation.h"
 
 InfoBarContainer::Delegate::~Delegate() {
 }
 
 InfoBarContainer::InfoBarContainer(
@@ skipping 85 matching lines @@
 }
 
 void InfoBarContainer::RemoveInfoBar(InfoBar* infobar) {
   infobar->set_container(NULL);
   InfoBars::iterator i(std::find(infobars_.begin(), infobars_.end(), infobar));
   DCHECK(i != infobars_.end());
   PlatformSpecificRemoveInfoBar(infobar);
   infobars_.erase(i);
 }
 
+void InfoBarContainer::InstantOverlayShown() {
+  // Suggestions are being shown on a |DEFAULT| page. Hide the infobars now.
+  // See comments for ModeChanged() for explanation.
+  HideAllInfoBars();
+  OnInfoBarStateChanged(false);
+}
+
 void InfoBarContainer::RemoveAllInfoBarsForDestruction() {
   // Before we remove any children, we reset |delegate_|, so that no removals
   // will result in us trying to call
   // delegate_->InfoBarContainerStateChanged().  This is important because at
   // this point |delegate_| may be shutting down, and it's at best unimportant
   // and at worst disastrous to call that.
   delegate_ = NULL;
 
   for (size_t i = infobars_.size(); i > 0; --i)
     infobars_[i - 1]->CloseSoon();
@@ skipping 38 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 overlay is ready is received via
-    // OverlayStateChanged(); this prevents jankiness caused by infobars hiding
+    // until a notification that the Instant overlay is ready is received via
+    // InstantOverlayShown(); 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::OverlayStateChanged(const InstantOverlayModel& model) {
-  // If 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()) {
-    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));
 
   // Search for the infobar associated with |delegate|.  We cannot search for
   // |delegate| in |tab_helper_|, because an InfoBar remains alive until its
   // close animation completes, while the delegate is removed from the tab
   // immediately.
@@ skipping 56 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)