Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(369)

Unified Diff: ui/app_list/search_box_view.cc

Issue 10534051: app_list: Add transition for apps grid and search results. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: rebase Created 8 years, 6 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « ui/app_list/search_box_view.h ('k') | ui/app_list/search_result_list_view.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: ui/app_list/search_box_view.cc
diff --git a/ui/app_list/search_box_view.cc b/ui/app_list/search_box_view.cc
index a16d42a023a0ac2966045a46d704eef61a629320..cf041ad69fd43593e6742ce008e020d1269e38fc 100644
--- a/ui/app_list/search_box_view.cc
+++ b/ui/app_list/search_box_view.cc
@@ -31,8 +31,7 @@ SearchBoxView::SearchBoxView(SearchBoxViewDelegate* 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_);
@@ -124,13 +123,8 @@ bool SearchBoxView::HandleKeyEvent(views::Textfield* sender,
}
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;
}
« no previous file with comments | « ui/app_list/search_box_view.h ('k') | ui/app_list/search_result_list_view.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698