alternate ntp: fix toolbar separator visibility when query is cleared

chrome/browser/ui/search/toolbar_search_animator.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/search/toolbar_search_animator.h"
 
 #include "chrome/browser/ui/search/search_model.h"
 #include "chrome/browser/ui/search/search_types.h"
 #include "chrome/browser/ui/search/toolbar_search_animator_observer.h"
 #include "chrome/browser/ui/tab_contents/tab_contents.h"
+#include "chrome/browser/ui/toolbar/toolbar_model.h"
 #include "chrome/browser/ui/webui/instant_ui.h"
 #include "ui/base/animation/multi_animation.h"
 
 namespace {
 
 const int kBackgroundChangeDelayMs = 100;
 const int kBackgroundChangeDurationMs = 200;
 
 const double kMinOpacity = 0.0f;
 const double kMaxOpacity = 1.0f;
 
 }  // namespace
 
 namespace chrome {
 namespace search {
 
-ToolbarSearchAnimator::ToolbarSearchAnimator(SearchModel* search_model)
+ToolbarSearchAnimator::ToolbarSearchAnimator(SearchModel* search_model,
+                                             ToolbarModel* toolbar_model)
     : search_model_(search_model),
+      toolbar_model_(toolbar_model),
       background_change_delay_ms_(kBackgroundChangeDelayMs),
       background_change_duration_ms_(kBackgroundChangeDurationMs),
       is_omnibox_popup_open_(false) {
   search_model_->AddObserver(this);
 }
 
 ToolbarSearchAnimator::~ToolbarSearchAnimator() {
   if (background_animation_.get())
     background_animation_->Stop();
   search_model_->RemoveObserver(this);
 }
 
 double ToolbarSearchAnimator::GetGradientOpacity() const {
   if (background_animation_.get() && background_animation_->is_animating())
     return background_animation_->CurrentValueBetween(kMinOpacity, kMaxOpacity);
   return search_model_->mode().is_ntp() ? kMinOpacity : kMaxOpacity;
 }
 
 bool ToolbarSearchAnimator::IsToolbarSeparatorVisible() const {
   // The toolbar separator is only visible in 2 scenarios:
-  // 1) when mode is |SEARCH_SUGGESTIONS| and the omnibox popup has finished
-  //    retracting before the navigation URL was committed, i.e. before the
-  //    mode was changed to |DEFAULT|.
+  // 1) when mode is |SEARCH_SUGGESTIONS|, user input is not in progress, and
+  //    the omnibox popup has finished retracting before the navigation URL was
+  //    committed, i.e. before the mode was changed to |DEFAULT|.
   // 2) when mode is |DEFAULT| and the omnibox popup has finished retracting.
   return !is_omnibox_popup_open_ &&
-      (search_model_->mode().mode == Mode::MODE_SEARCH_SUGGESTIONS ||
+      ((search_model_->mode().mode == Mode::MODE_SEARCH_SUGGESTIONS &&
+        !toolbar_model_->input_in_progress()) ||
        search_model_->mode().is_default());
 }
 
 void ToolbarSearchAnimator::OnOmniboxPopupClosed() {
   is_omnibox_popup_open_ = false;
   FOR_EACH_OBSERVER(ToolbarSearchAnimatorObserver, observers_,
                     OnToolbarSeparatorChanged());
 }
 
 void ToolbarSearchAnimator::FinishAnimation(TabContents* tab_contents) {
@@ skipping 85 matching lines @@
 
   // Notify observers of animation cancelation.
   if (notify_background_observers) {
     FOR_EACH_OBSERVER(ToolbarSearchAnimatorObserver, observers_,
                       OnToolbarBackgroundAnimatorCanceled(tab_contents));
   }
 }
 
 }  // namespace search
 }  // namespace chrome