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

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

Issue 2938203004: Revert of 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
« no previous file with comments | « ui/app_list/views/app_list_view_unittest.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 7841388bd63fffa5cdfefc49a25236866a59fb02..77236d3f3c1d9ae1a2c044dee41923f7cf57823b 100644
--- a/ui/app_list/views/search_box_view.cc
+++ b/ui/app_list/views/search_box_view.cc
@@ -54,6 +54,7 @@
constexpr int kBackgroundBorderCornerRadius = 2;
constexpr int kBackgroundBorderCornerRadiusFullscreen = 24;
+
constexpr int kGoogleIconSize = 24;
constexpr int kMicIconSize = 24;
@@ -367,8 +368,11 @@
UpdateModel();
view_delegate_->AutoLaunchCanceled();
NotifyQueryChanged();
- if (is_fullscreen_app_list_enabled_)
- app_list_view_->SetStateFromSearchBoxView(search_box_->text().empty());
+
+ if (is_fullscreen_app_list_enabled_ && !app_list_view_->is_fullscreen()) {
+ // If the app list is in the peeking state, switch it to fullscreen.
+ app_list_view_->SetState(AppListView::FULLSCREEN);
+ }
}
bool SearchBoxView::HandleKeyEvent(views::Textfield* sender,
« no previous file with comments | « ui/app_list/views/app_list_view_unittest.cc ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698