Search state transitions not working

chrome/browser/ui/views/search_view_controller.h

 // 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.
 
 #ifndef CHROME_BROWSER_UI_VIEWS_SEARCH_VIEW_CONTROLLER_H_
 #define CHROME_BROWSER_UI_VIEWS_SEARCH_VIEW_CONTROLLER_H_
 
 #include "base/basictypes.h"
 #include "base/compiler_specific.h"
 #include "chrome/browser/ui/search/search_model_observer.h"
@@ skipping 54 matching lines @@
   virtual void OnImplicitAnimationsCompleted() OVERRIDE;
 
  private:
   enum State {
     // Search/ntp is not visible.
     STATE_NOT_VISIBLE,
 
     // Layout for the new tab page.
     STATE_NTP,
 
-    // Animating between STATE_NTP and STATE_SEARCH.
-    STATE_ANIMATING,
+    // Animating between STATE_NTP and STATE_SUGGESTIONS.
+    STATE_NTP_ANIMATING,
 
-    // Search layout. This is only used when the omnibox is visible.
-    STATE_SEARCH,
+    // Search layout. This is only used when the suggestions UI is visible.
+    STATE_SUGGESTIONS,
   };
 
   class OmniboxPopupViewParent;
 
   // Invokes SetState() based on the search model and omnibox.
   void UpdateState();
 
   // Updates the views and animations. May do any of the following: create the
   // views, start an animation, or destroy the views. What happens is determined
   // from the current state of the SearchModel.
@@ skipping 65 matching lines @@
   // An alias to |contents_container_->active()|, but reparented within
   // |ntp_view_| when in the NTP state.
   views::WebView* content_view_;
 
   OmniboxPopupViewParent* omnibox_popup_view_parent_;
 
   DISALLOW_COPY_AND_ASSIGN(SearchViewController);
 };
 
 #endif  // CHROME_BROWSER_UI_VIEWS_SEARCH_VIEW_CONTROLLER_H_