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

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

Issue 2941573002: cros: add google/mic icons to searchbox (Closed)
Patch Set: constexpr 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/vector_icons/vector_icons.h.template ('k') | ui/app_list/views/search_box_view.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: ui/app_list/views/contents_view.cc
diff --git a/ui/app_list/views/contents_view.cc b/ui/app_list/views/contents_view.cc
index ff96d24ee85bf038b1b74841c0c98e76e5399254..8508e1069bfffad98ad70913d0a6cd373a309193 100644
--- a/ui/app_list/views/contents_view.cc
+++ b/ui/app_list/views/contents_view.cc
@@ -210,13 +210,15 @@ void ContentsView::ActivePageChanged() {
DCHECK(start_page_view_);
// Set the visibility of the search box's back button.
- app_list_main_view_->search_box_view()->back_button()->SetVisible(
- state != AppListModel::STATE_START);
- app_list_main_view_->search_box_view()->Layout();
- bool folder_active = (state == AppListModel::STATE_APPS)
- ? apps_container_view_->IsInFolderView()
- : false;
- app_list_main_view_->search_box_view()->SetBackButtonLabel(folder_active);
+ if (!features::IsFullscreenAppListEnabled()) {
+ app_list_main_view_->search_box_view()->back_button()->SetVisible(
+ state != AppListModel::STATE_START);
+ app_list_main_view_->search_box_view()->Layout();
+ bool folder_active = (state == AppListModel::STATE_APPS)
+ ? apps_container_view_->IsInFolderView()
+ : false;
+ app_list_main_view_->search_box_view()->SetBackButtonLabel(folder_active);
+ }
// Whenever the page changes, the custom launcher page is considered to have
// been reset.
« no previous file with comments | « ui/app_list/vector_icons/vector_icons.h.template ('k') | ui/app_list/views/search_box_view.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698