Make app list return to previous page after search.

ui/app_list/views/contents_view.h

Index: ui/app_list/views/contents_view.h
diff --git a/ui/app_list/views/contents_view.h b/ui/app_list/views/contents_view.h
index e57a0d2a34958daffc9192839a0bfc8e7cb8a556..b828490ad942a4b8eb18b46eb10d6d0fd33b7047 100644
--- a/ui/app_list/views/contents_view.h
+++ b/ui/app_list/views/contents_view.h
@@ -67,10 +67,14 @@ class APP_LIST_EXPORT ContentsView : public views::View,
 
   void SetContentsSwitcherView(ContentsSwitcherView* contents_switcher_view);
 
+  // Shows/hides the search results. Hiding the search results will cause the
+  // app list to return to the page that was displayed before
+  // ShowSearchResults(true) was invoked.
   void ShowSearchResults(bool show);
-  void ShowFolderContent(AppListFolderItem* folder);
   bool IsShowingSearchResults() const;
 
+  void ShowFolderContent(AppListFolderItem* folder);
+
   // Sets the active launcher page and animates the pages into place.
   void SetActivePage(int page_index);
 
@@ -156,6 +160,9 @@ class APP_LIST_EXPORT ContentsView : public views::View,
   // Maps NamedPage onto |view_model_| indices.
   std::map<NamedPage, int> named_page_to_view_;
 
+  // The page that was showing before ShowSearchResults(true) was invoked.
+  int page_before_search_;
+
   // Manages the pagination for the launcher pages.
   PaginationModel pagination_model_;