Update To 11.40.268.0

[platform/framework/web/crosswalk.git] / src / chrome / browser / ui / app_list / app_list_shower_views.h

diff --git a/src/chrome/browser/ui/app_list/app_list_shower_views.h b/src/chrome/browser/ui/app_list/app_list_shower_views.h
index f574a2f..6feb12c 100644 (file)
--- a/src/chrome/browser/ui/app_list/app_list_shower_views.h
+++ b/src/chrome/browser/ui/app_list/app_list_shower_views.h
@@ -6,7 +6,6 @@
 #define CHROME_BROWSER_UI_APP_LIST_APP_LIST_SHOWER_VIEWS_H_
 
 #include "base/memory/scoped_ptr.h"
-#include "ui/app_list/pagination_model.h"
 #include "ui/gfx/native_widget_types.h"
 
 namespace app_list {
@@ -25,7 +24,7 @@ class AppListShower {
   explicit AppListShower(AppListShowerDelegate* delegate);
   virtual ~AppListShower();
 
-  void ShowForProfile(Profile* requested_profile);
+  void ShowForCurrentProfile();
   gfx::NativeWindow GetWindow();
 
   app_list::AppListView* app_list() { return app_list_; }
@@ -53,6 +52,7 @@ class AppListShower {
  private:
   friend class ::AppListShowerUnitTest;
 
+  void ResetKeepAliveSoon();
   void ResetKeepAlive();
 
   AppListShowerDelegate* delegate_;  // Weak. Owns this.
@@ -67,7 +67,6 @@ class AppListShower {
   scoped_ptr<ScopedKeepAlive> keep_alive_;
 
   bool window_icon_updated_;
-  app_list::PaginationModel pagination_model_;
 
   DISALLOW_COPY_AND_ASSIGN(AppListShower);
 };