Make app list return to previous page after search.

ui/app_list/views/contents_view.h

 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #ifndef UI_APP_LIST_VIEWS_CONTENTS_VIEW_H_
 #define UI_APP_LIST_VIEWS_CONTENTS_VIEW_H_
 
 #include <map>
 
 #include "base/basictypes.h"
@@ skipping 49 matching lines @@
   // The app list gets closed and drag and drop operations need to be cancelled.
   void CancelDrag();
 
   // If |drag_and_drop| is not NULL it will be called upon drag and drop
   // operations outside the application list.
   void SetDragAndDropHostOfCurrentAppList(
       ApplicationDragAndDropHost* drag_and_drop_host);
 
   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);
+  bool IsShowingSearchResults() const;
+
   void ShowFolderContent(AppListFolderItem* folder);
-  bool IsShowingSearchResults() const;
 
   // Sets the active launcher page and animates the pages into place.
   void SetActivePage(int page_index);
 
   // The index of the currently active launcher page.
   int GetActivePageIndex() const;
 
   // True if |named_page| is the current active laucher page.
   bool IsNamedPageActive(NamedPage named_page) const;
 
@@ skipping 66 matching lines @@
   StartPageView* start_page_view_;
 
   AppListMainView* app_list_main_view_;     // Parent view, owns this.
   // Sibling view, owned by |app_list_main_view_|.
   ContentsSwitcherView* contents_switcher_view_;
 
   scoped_ptr<views::ViewModel> view_model_;
   // 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_;
 
   DISALLOW_COPY_AND_ASSIGN(ContentsView);
 };
 
 }  // namespace app_list
 
 #endif  // UI_APP_LIST_VIEWS_CONTENTS_VIEW_H_