| Index: chrome/browser/ui/views/app_list/linux/app_list_service_linux.h
|
| diff --git a/chrome/browser/ui/views/app_list/linux/app_list_service_linux.h b/chrome/browser/ui/views/app_list/linux/app_list_service_linux.h
|
| index 81a204695c91c6d29b6a439334aec381bb3d3972..11ca2c69d0b55300e84deb6f20fde90f94cf8185 100644
|
| --- a/chrome/browser/ui/views/app_list/linux/app_list_service_linux.h
|
| +++ b/chrome/browser/ui/views/app_list/linux/app_list_service_linux.h
|
| @@ -5,44 +5,36 @@
|
| #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 "base/memory/scoped_ptr.h"
|
| -#include "chrome/browser/ui/app_list/app_list_service_impl.h"
|
| +#include "chrome/browser/ui/app_list/app_list_service_views.h"
|
| +#include "ui/app_list/views/app_list_view_observer.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 AppListServiceImpl {
|
| +class AppListServiceLinux : public AppListServiceViews,
|
| + public app_list::AppListViewObserver {
|
| 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:
|
| + virtual void OnActivationChanged(views::Widget* widget, bool active) OVERRIDE;
|
| +
|
| private:
|
| friend struct DefaultSingletonTraits<AppListServiceLinux>;
|
|
|
| - AppListServiceLinux();
|
| + // AppListCreatorDelegate overrides:
|
| + virtual void OnViewCreated() OVERRIDE;
|
| + virtual void OnViewWillBeDestroyed() OVERRIDE;
|
| + virtual void OnViewHidden() OVERRIDE;
|
| + virtual void MoveNearCursor(app_list::AppListView* view) OVERRIDE;
|
|
|
| - // Responsible for putting views on the screen.
|
| - scoped_ptr<AppListShower> shower_;
|
| - scoped_ptr<AppListControllerDelegate> controller_delegate_;
|
| + AppListServiceLinux();
|
|
|
| DISALLOW_COPY_AND_ASSIGN(AppListServiceLinux);
|
| };
|
|
|