alternate ntp: fix website page jankiness when suggestions show and top bars are hidden

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"
 
 #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_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(
     Delegate* delegate,
-    chrome::search::SearchModel* search_model)
+    chrome::search::SearchModel* search_model,
+    const InstantModel* instant_model)
     : delegate_(delegate),
       infobar_service_(NULL),
       search_model_(search_model),
+      instant_model_(instant_model),
       top_arrow_target_height_(InfoBar::kDefaultArrowTargetHeight) {
   if (search_model_)
     search_model_->AddObserver(this);
+  if (instant_model_)
+    instant_model_->AddObserver(this);

[Peter Kasting, 2013/01/28 21:51:00]

Please pass in a non-const pointer if you're going to call this, and file a bug
to fix InstantModel to not allow Add/RemoveObserver() calls on a const object. 
See latest reply to David as to why I'm asking for this.

[kuan, 2013/01/29 00:17:08]

i was forced to use const InstantModel 'cos InstantController::model() returns
it as a const.  per the discussion between dhollowa@ and u, dhollowa@ will
modify the constness of InstantModel in a followup cl, at which time, he would
then remove the const here.

 }
 
 InfoBarContainer::~InfoBarContainer() {
   // RemoveAllInfoBarsForDestruction() should have already cleared our infobars.
   DCHECK(infobars_.empty());
   if (search_model_)
     search_model_->RemoveObserver(this);
+  if (instant_model_)
+    instant_model_->RemoveObserver(this);
 }
 
 void InfoBarContainer::ChangeInfoBarService(InfoBarService* infobar_service) {
   registrar_.RemoveAll();
 
   infobars_shown_time_ = base::TimeTicks();
   HideAllInfoBars();
 
   infobar_service_ = infobar_service;
   if (infobar_service_) {
@@ skipping 104 matching lines @@
     default:
       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().

[Peter Kasting, 2013/01/28 21:51:00]

Nit: Add commentary on why you do this (i.e. what the effects of doing it/not
doing it are).

[kuan, 2013/01/29 00:17:08]

Done.

+    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.
+  // 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 55 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)