Search state transitions not working

chrome/browser/ui/views/search_view_controller.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/search_view_controller.h"
 
 #include "chrome/browser/ui/search/search_model.h"
 #include "chrome/browser/ui/search/search_tab_helper.h"
 #include "chrome/browser/ui/search/search_types.h"
 #include "chrome/browser/ui/search/search_ui.h"
@@ skipping 281 matching lines @@
 
 void SearchViewController::InstantReady() {
 }
 
 void SearchViewController::ModeChanged(const chrome::search::Mode& old_mode,
                                        const chrome::search::Mode& new_mode) {
   UpdateState();
 }
 
 void SearchViewController::OnImplicitAnimationsCompleted() {
-  DCHECK_EQ(STATE_ANIMATING, state_);
-  state_ = STATE_SEARCH;
+  DCHECK_EQ(STATE_NTP_ANIMATING, state_);
+  state_ = STATE_SUGGESTIONS;
   ntp_view_->SetVisible(false);
   // While |ntp_view_| was fading out, location bar was animating from the
   // middle of the NTP page to the top toolbar, at the same rate.
   // Suggestions need to be aligned with the final location of the location bar.
   // So if omnibox popup view (InlineOmniboxPopupView) is visible, force a
   // re-layout of its children (i.e. the suggestions) to align with the location
   // bar's final bounds.
   if (omnibox_popup_view_parent_->is_child_visible())
     omnibox_popup_view_parent_->child_at(0)->Layout();
 }
 
 void SearchViewController::UpdateState() {
   if (!search_model()) {
     DestroyViews();
     return;
   }
   State new_state = STATE_NOT_VISIBLE;
   switch (search_model()->mode().mode) {
     case chrome::search::Mode::MODE_DEFAULT:
       break;
 
     case chrome::search::Mode::MODE_NTP:
       new_state = STATE_NTP;
       break;
 
-    case chrome::search::Mode::MODE_SEARCH:
-      if (search_model()->mode().animate && state_ == STATE_NTP) {
-        new_state = STATE_ANIMATING;
-      } else {
-        // Only enter into MODE_SEARCH if the omnibox is visible.
-        if (omnibox_popup_view_parent_->is_child_visible())
-          new_state = STATE_SEARCH;
-        else
-          new_state = STATE_NOT_VISIBLE;
-      }
+    case chrome::search::Mode::MODE_SEARCH_SUGGESTIONS:
+      if (search_model()->mode().animate && state_ == STATE_NTP)
+        new_state = STATE_NTP_ANIMATING;
+      else if (omnibox_popup_view_parent_->is_child_visible())
+        new_state = STATE_SUGGESTIONS;
+      break;
+
+    case chrome::search::Mode::MODE_SEARCH_RESULTS:
+      new_state = STATE_NOT_VISIBLE;
       break;
   }
   SetState(new_state);
 }
 
 void SearchViewController::SetState(State state) {
   if (state_ == state)
     return;
 
   State old_state = state_;
   state_ = state;
   switch (state_) {
     case STATE_NOT_VISIBLE:
       DestroyViews();
       break;
 
     case STATE_NTP:
       DestroyViews();
       CreateViews();
       break;
 
-    case STATE_ANIMATING:
+    case STATE_NTP_ANIMATING:
       // Should only animate from the ntp.
       DCHECK_EQ(STATE_NTP, old_state);
       StartAnimation();
       break;
 
-    case STATE_SEARCH:
+    case STATE_SUGGESTIONS:
       DestroyViews();
       CreateViews();
       ntp_view_->SetVisible(false);
       break;
   }
 }
 
 void SearchViewController::StartAnimation() {
   int factor = InstantUI::GetSlowAnimationScaleFactor();
   {
@@ skipping 93 matching lines @@
   ntp_view_ = NULL;
   logo_view_ = NULL;
   content_view_ = NULL;
 
   state_ = STATE_NOT_VISIBLE;
 }
 
 void SearchViewController::PopupVisibilityChanged() {
   // Don't do anything while animating if the child is visible. Otherwise we'll
   // prematurely cancel the animation.
-  if (state_ != STATE_ANIMATING ||
+  if (state_ != STATE_NTP_ANIMATING ||
       !omnibox_popup_view_parent_->is_child_visible()) {
     UpdateState();
   }
 }
 
 chrome::search::SearchModel* SearchViewController::search_model() {
   return tab_contents_ ? tab_contents_->search_tab_helper()->model() : NULL;
 }
 
 content::WebContents* SearchViewController::web_contents() {
   return tab_contents_ ? tab_contents_->web_contents() : NULL;
 }