app_list: Add transition for apps grid and search results.

ui/app_list/search_box_view.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 "ui/app_list/search_box_view.h"
 
 #include <algorithm>
 
 #include "ui/app_list/search_box_model.h"
 #include "ui/app_list/search_box_view_delegate.h"
@@ skipping 13 matching lines @@
 
 const SkColor kHintTextColor = SkColorSetRGB(0xA0, 0xA0, 0xA0);
 
 }  // namespace
 
 SearchBoxView::SearchBoxView(SearchBoxViewDelegate* delegate)
     : delegate_(delegate),
       model_(NULL),
       icon_view_(NULL),
       search_box_(NULL),
-      grid_view_(NULL),
-      results_view_(NULL) {
+      contents_view_(NULL) {
   icon_view_ = new views::ImageView;
   AddChildView(icon_view_);
 
   search_box_ = new views::Textfield;
   search_box_->RemoveBorder();
   ResourceBundle& rb = ResourceBundle::GetSharedInstance();
   search_box_->SetFont(gfx::Font(
       rb.GetFont(ResourceBundle::BaseFont).GetFontName(),
       kFontSize));
   search_box_->set_placeholder_text_color(kHintTextColor);
@@ skipping 71 matching lines @@
   if (has_query && key_event.key_code() == ui::VKEY_ESCAPE) {
     search_box_->SetText(string16());
     // Updates model and fires query changed manually because SetText above
     // does not generate ContentsChanged notification.
     UpdateModel();
     NotifyQueryChanged();
     return true;
   }
 
   bool handled = false;
-  if (has_query) {
-    if (results_view_ && results_view_->visible())
-      handled = results_view_->OnKeyPressed(key_event);
-  } else {
-    if (grid_view_ && grid_view_->visible())
-      handled = grid_view_->OnKeyPressed(key_event);
-  }
+  if (contents_view_ && contents_view_->visible())
+    handled = contents_view_->OnKeyPressed(key_event);
 
   return handled;
 }
 
 void SearchBoxView::IconChanged() {
   icon_view_->SetImage(model_->icon());
 }
 
 void SearchBoxView::HintTextChanged() {
   search_box_->set_placeholder_text(model_->hint_text());
 }
 
 void SearchBoxView::SelectionModelChanged() {
   search_box_->SelectSelectionModel(model_->selection_model());
 }
 
 void SearchBoxView::TextChanged() {
   search_box_->SetText(model_->text());
 }
 
 }  // namespace app_list