Revert 267354 "Refactor views app list services to allow more co..."

trunk/src/chrome/browser/ui/views/app_list/linux/app_list_service_linux.h

Index: trunk/src/chrome/browser/ui/views/app_list/linux/app_list_service_linux.h
===================================================================
--- trunk/src/chrome/browser/ui/views/app_list/linux/app_list_service_linux.h	(revision 267382)
+++ trunk/src/chrome/browser/ui/views/app_list/linux/app_list_service_linux.h	(working copy)
@@ -5,37 +5,45 @@
 #ifndef CHROME_BROWSER_UI_VIEWS_APP_LIST_LINUX_APP_LIST_SERVICE_LINUX_H_
 #define CHROME_BROWSER_UI_VIEWS_APP_LIST_LINUX_APP_LIST_SERVICE_LINUX_H_
 
-#include "chrome/browser/ui/app_list/app_list_service_views.h"
-#include "ui/app_list/views/app_list_view_observer.h"
+#include "base/memory/scoped_ptr.h"
+#include "chrome/browser/ui/app_list/app_list_service_impl.h"
 
 template <typename T> struct DefaultSingletonTraits;
 
+class AppListShower;
+
 // AppListServiceLinux manages global resources needed for the app list to
 // operate, and controls when the app list is opened and closed.
-class AppListServiceLinux : public AppListServiceViews,
-                            public app_list::AppListViewObserver {
+class AppListServiceLinux : public AppListServiceImpl {
  public:
   virtual ~AppListServiceLinux();
 
   static AppListServiceLinux* GetInstance();
+  void set_can_close(bool can_close);
+  void OnViewBeingDestroyed();
 
+  // AppListService overrides:
+  virtual void Init(Profile* initial_profile) OVERRIDE;
+  virtual void CreateForProfile(Profile* requested_profile) OVERRIDE;
+  virtual void ShowForProfile(Profile* requested_profile) OVERRIDE;
+  virtual void DismissAppList() OVERRIDE;
+  virtual bool IsAppListVisible() const OVERRIDE;
+  virtual gfx::NativeWindow GetAppListWindow() OVERRIDE;
+  virtual Profile* GetCurrentAppListProfile() OVERRIDE;
+  virtual AppListControllerDelegate* GetControllerDelegate() OVERRIDE;
+
   // AppListServiceImpl overrides:
   virtual void CreateShortcut() OVERRIDE;
 
-  // app_list::AppListViewObserver overrides:
-  virtual void OnActivationChanged(views::Widget* widget, bool active) OVERRIDE;
-
  private:
   friend struct DefaultSingletonTraits<AppListServiceLinux>;
 
-  // AppListShowerDelegate overrides:
-  virtual void OnViewCreated() OVERRIDE;
-  virtual void OnViewBeingDestroyed() OVERRIDE;
-  virtual void OnViewDismissed() OVERRIDE;
-  virtual void MoveNearCursor(app_list::AppListView* view) OVERRIDE;
-
   AppListServiceLinux();
 
+  // Responsible for putting views on the screen.
+  scoped_ptr<AppListShower> shower_;
+  scoped_ptr<AppListControllerDelegate> controller_delegate_;
+
   DISALLOW_COPY_AND_ASSIGN(AppListServiceLinux);
 };