| Index: ui/app_list/views/app_list_main_view.cc
|
| diff --git a/ui/app_list/views/app_list_main_view.cc b/ui/app_list/views/app_list_main_view.cc
|
| index 80158d8c036e796e5c282210f587e74a79e7e02b..8874bbeccc6d7db126e3298b2dd4f527848d391b 100644
|
| --- a/ui/app_list/views/app_list_main_view.cc
|
| +++ b/ui/app_list/views/app_list_main_view.cc
|
| @@ -168,9 +168,10 @@ void AppListMainView::ModelChanged() {
|
| Layout();
|
| }
|
|
|
| -void AppListMainView::OnContentsViewActivePageChanged() {
|
| +void AppListMainView::UpdateSearchBoxVisibility() {
|
| search_box_view_->SetVisible(
|
| - !contents_view_->IsNamedPageActive(ContentsView::NAMED_PAGE_START));
|
| + !contents_view_->IsNamedPageActive(ContentsView::NAMED_PAGE_START) ||
|
| + contents_view_->IsShowingSearchResults());
|
| }
|
|
|
| void AppListMainView::OnStartPageSearchButtonPressed() {
|
| @@ -266,6 +267,7 @@ void AppListMainView::QueryChanged(SearchBoxView* sender) {
|
| base::TrimWhitespace(model_->search_box()->text(), base::TRIM_ALL, &query);
|
| bool should_show_search = !query.empty();
|
| contents_view_->ShowSearchResults(should_show_search);
|
| + UpdateSearchBoxVisibility();
|
|
|
| if (should_show_search)
|
| delegate_->StartSearch();
|
|
|