| Index: chrome/browser/ui/app_list/app_list_controller_delegate_views.h
|
| diff --git a/chrome/browser/ui/views/app_list/linux/app_list_controller_delegate_linux.h b/chrome/browser/ui/app_list/app_list_controller_delegate_views.h
|
| similarity index 40%
|
| rename from chrome/browser/ui/views/app_list/linux/app_list_controller_delegate_linux.h
|
| rename to chrome/browser/ui/app_list/app_list_controller_delegate_views.h
|
| index 2235aa6c4568f319fa06287a45dd72bfda08c320..c17d042737a80f693f0e5fce9cea1b946faa6ebe 100644
|
| --- a/chrome/browser/ui/views/app_list/linux/app_list_controller_delegate_linux.h
|
| +++ b/chrome/browser/ui/app_list/app_list_controller_delegate_views.h
|
| @@ -2,26 +2,19 @@
|
| // Use of this source code is governed by a BSD-style license that can be
|
| // found in the LICENSE file.
|
|
|
| -#ifndef CHROME_BROWSER_UI_VIEWS_APP_LIST_LINUX_APP_LIST_CONTROLLER_DELEGATE_LINUX_H_
|
| -#define CHROME_BROWSER_UI_VIEWS_APP_LIST_LINUX_APP_LIST_CONTROLLER_DELEGATE_LINUX_H_
|
| +#ifndef CHROME_BROWSER_UI_APP_LIST_APP_LIST_CONTROLLER_DELEGATE_VIEWS_H_
|
| +#define CHROME_BROWSER_UI_APP_LIST_APP_LIST_CONTROLLER_DELEGATE_VIEWS_H_
|
|
|
| -#include "base/files/file_path.h"
|
| #include "chrome/browser/ui/app_list/app_list_controller_delegate_impl.h"
|
| -#include "ui/gfx/image/image_skia.h"
|
| -#include "ui/gfx/native_widget_types.h"
|
|
|
| -class AppListServiceLinux;
|
| -class Profile;
|
| +class AppListServiceViews;
|
|
|
| -namespace extensions {
|
| -class Extension;
|
| -}
|
| -
|
| -// Linux-specific configuration and behaviour for the AppList.
|
| -class AppListControllerDelegateLinux : public AppListControllerDelegateImpl {
|
| +// Conveys messages from a views-backed app list to the AppListService that
|
| +// created it.
|
| +class AppListControllerDelegateViews : public AppListControllerDelegateImpl {
|
| public:
|
| - explicit AppListControllerDelegateLinux(AppListServiceLinux* service);
|
| - virtual ~AppListControllerDelegateLinux();
|
| + explicit AppListControllerDelegateViews(AppListServiceViews* service);
|
| + virtual ~AppListControllerDelegateViews();
|
|
|
| // AppListControllerDelegate overrides:
|
| virtual void ViewClosing() OVERRIDE;
|
| @@ -30,9 +23,9 @@ class AppListControllerDelegateLinux : public AppListControllerDelegateImpl {
|
| virtual bool CanDoCreateShortcutsFlow() OVERRIDE;
|
|
|
| private:
|
| - AppListServiceLinux* service_;
|
| + AppListServiceViews* service_; // Weak. Owns us.
|
|
|
| - DISALLOW_COPY_AND_ASSIGN(AppListControllerDelegateLinux);
|
| + DISALLOW_COPY_AND_ASSIGN(AppListControllerDelegateViews);
|
| };
|
|
|
| -#endif // CHROME_BROWSER_UI_VIEWS_APP_LIST_LINUX_APP_LIST_CONTROLLER_DELEGATE_LINUX_H_
|
| +#endif // CHROME_BROWSER_UI_APP_LIST_APP_LIST_CONTROLLER_DELEGATE_VIEWS_H_
|
|
|