Added back button when in folder view.

ui/app_list/views/contents_view.cc

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 8508e1069bfffad98ad70913d0a6cd373a309193..07587cd43db10d321a11bdf904f054b210949e22 100644
--- a/ui/app_list/views/contents_view.cc
+++ b/ui/app_list/views/contents_view.cc
@@ -210,14 +210,20 @@ void ContentsView::ActivePageChanged() {
   DCHECK(start_page_view_);
 
   // Set the visibility of the search box's back button.
+  bool folder_active = state == AppListModel::STATE_APPS &&

[xiyuan, 2017/06/22 17:33:24]

nit: bool -> const bool

[newcomer, 2017/06/23 23:28:08]

Done.

+                       apps_container_view_->IsInFolderView();
+
   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);
+  } else {
+    if (app_list_main_view()->Contains(

[vadimt, 2017/06/22 18:28:08]

Nit: app_list_main_view_

[newcomer, 2017/06/23 23:28:08]

Done.

+            app_list_main_view()->search_box_view())) {

[xiyuan, 2017/06/22 17:33:24]

Saw a comment says the SearchBoxView is added to a child widget. Would this ever
be true ?

[newcomer, 2017/06/23 23:28:08]

You're correct, that code was not getting ran. Thanks.

+      app_list_main_view_->search_box_view()->ShowBackOrGoogleIcon(
+          folder_active);
+    }
   }
 
   // Whenever the page changes, the custom launcher page is considered to have