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

[vadimt, 2017/06/22 00:36:12]

state == AppListModel::STATE_APPS &&
                            ? apps_container_view_->IsInFolderView()

[newcomer, 2017/06/22 16:49:06]

Done.

+                           ? apps_container_view_->IsInFolderView()
+                           : false;
   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(app_list_main_view()->search_box_view()))
+      app_list_main_view_->search_box_view()->SwapGoogleIconWithBackButton(

[vadimt, 2017/06/22 00:36:12]

{}

[newcomer, 2017/06/22 16:49:06]

Done.

+          folder_active);
   }
 
   // Whenever the page changes, the custom launcher page is considered to have