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

Unified Diff: ui/app_list/views/search_box_view.cc

Issue 2939693004: Added HALF, FULLSCREEN_ALL_APPS, and FULLSCREEN_SEARCH. (Closed)
Patch Set: Created 3 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
« ui/app_list/views/app_list_view.cc ('K') | « ui/app_list/views/app_list_view.cc ('k') | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: ui/app_list/views/search_box_view.cc
diff --git a/ui/app_list/views/search_box_view.cc b/ui/app_list/views/search_box_view.cc
index 599f298e8c5f24eec2bbe104450765527e879a72..81cdb9bc0976b0f82ca6dbdc3cb56c6f47df4be0 100644
--- a/ui/app_list/views/search_box_view.cc
+++ b/ui/app_list/views/search_box_view.cc
@@ -345,11 +345,8 @@ void SearchBoxView::ContentsChanged(views::Textfield* sender,
UpdateModel();
view_delegate_->AutoLaunchCanceled();
NotifyQueryChanged();
-
- if (IsFullscreenAppListEnabled() && !app_list_view_->is_fullscreen()) {
- // If the app list is in the peeking state, switch it to fullscreen.
- app_list_view_->SetState(AppListView::FULLSCREEN);
- }
+ if (IsFullscreenAppListEnabled())
+ app_list_view_->SetStateFromSearchBoxView(search_box_->text().empty());
}
bool SearchBoxView::HandleKeyEvent(views::Textfield* sender,
« ui/app_list/views/app_list_view.cc ('K') | « ui/app_list/views/app_list_view.cc ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698