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

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

Index: trunk/src/chrome/browser/ui/views/app_list/linux/app_list_linux.h
===================================================================
--- trunk/src/chrome/browser/ui/views/app_list/linux/app_list_linux.h	(revision 267382)
+++ trunk/src/chrome/browser/ui/views/app_list/linux/app_list_linux.h	(working copy)
@@ -5,7 +5,10 @@
 #ifndef CHROME_BROWSER_UI_VIEWS_APP_LIST_LINUX_APP_LIST_LINUX_H_
 #define CHROME_BROWSER_UI_VIEWS_APP_LIST_LINUX_APP_LIST_LINUX_H_
 
+#include "base/callback.h"
+#include "chrome/browser/ui/app_list/app_list.h"
 #include "chrome/browser/ui/app_list/app_list_positioner.h"
+#include "ui/app_list/views/app_list_view_observer.h"
 
 namespace app_list {
 class AppListView;
@@ -17,10 +20,16 @@
 class Size;
 }  // namespace gfx
 
-// Responsible for positioning an AppListView on Linux.
-// TODO(tapted): Shouldn't be a class - move the static member functions out.
-class AppListLinux {
+// Responsible for positioning, hiding and showing an AppListView on Linux.
+// This includes watching window activation/deactivation messages to determine
+// if the user has clicked away from it.
+class AppListLinux : public AppList,
+                     public app_list::AppListViewObserver {
  public:
+  AppListLinux(app_list::AppListView* view,
+               const base::Closure& on_should_dismiss);
+  virtual ~AppListLinux();
+
   // Determines which screen edge the shelf is aligned to. This tries to find
   // the edge of the surface where the user normally launches apps from (so, for
   // example, on Gnome Classic, this is the applications menu, not the taskbar).
@@ -37,7 +46,27 @@
                                     const gfx::Point& cursor,
                                     AppListPositioner::ScreenEdge edge);
 
-  static void MoveNearCursor(app_list::AppListView* view);
+  // AppList:
+  virtual void Show() OVERRIDE;
+  virtual void Hide() OVERRIDE;
+  virtual void MoveNearCursor() OVERRIDE;
+  virtual bool IsVisible() OVERRIDE;
+  virtual void Prerender() OVERRIDE;
+  virtual gfx::NativeWindow GetWindow() OVERRIDE;
+  virtual void SetProfile(Profile* profile) OVERRIDE;
+
+  // app_list::AppListViewObserver:
+  virtual void OnActivationChanged(views::Widget* widget, bool active) OVERRIDE;
+
+ private:
+  // Weak pointer. The view manages its own lifetime.
+  app_list::AppListView* view_;
+  bool window_icon_updated_;
+
+  // Called to request |view_| be closed.
+  base::Closure on_should_dismiss_;
+
+  DISALLOW_COPY_AND_ASSIGN(AppListLinux);
 };
 
 #endif  // CHROME_BROWSER_UI_VIEWS_APP_LIST_LINUX_APP_LIST_LINUX_H_