| Index: chrome/browser/ui/app_list/app_list_service_mac.h
|
| diff --git a/chrome/browser/ui/app_list/app_list_service_mac.h b/chrome/browser/ui/app_list/app_list_service_mac.h
|
| index 406faf045fb1d3efebd8f645e87558ac94eca6b2..39d4d971685b17f85b1956bb1d6478ad96805844 100644
|
| --- a/chrome/browser/ui/app_list/app_list_service_mac.h
|
| +++ b/chrome/browser/ui/app_list/app_list_service_mac.h
|
| @@ -32,7 +32,7 @@ class AppListServiceMacTestApi;
|
| class AppListServiceMac : public AppListServiceImpl,
|
| public apps::AppShimHandler {
|
| public:
|
| - virtual ~AppListServiceMac();
|
| + ~AppListServiceMac() override;
|
|
|
| static AppListServiceMac* GetInstance();
|
|
|
| @@ -56,32 +56,31 @@ class AppListServiceMac : public AppListServiceImpl,
|
| void WindowAnimationDidEnd();
|
|
|
| // AppListService overrides:
|
| - virtual void Init(Profile* initial_profile) override;
|
| - virtual void ShowForProfile(Profile* requested_profile) override;
|
| - virtual void DismissAppList() override;
|
| - virtual bool IsAppListVisible() const override;
|
| - virtual void EnableAppList(Profile* initial_profile,
|
| - AppListEnableSource enable_source) override;
|
| - virtual gfx::NativeWindow GetAppListWindow() override;
|
| - virtual AppListControllerDelegate* GetControllerDelegate() override;
|
| - virtual Profile* GetCurrentAppListProfile() override;
|
| - virtual void CreateShortcut() override;
|
| + void Init(Profile* initial_profile) override;
|
| + void ShowForProfile(Profile* requested_profile) override;
|
| + void DismissAppList() override;
|
| + bool IsAppListVisible() const override;
|
| + void EnableAppList(Profile* initial_profile,
|
| + AppListEnableSource enable_source) override;
|
| + gfx::NativeWindow GetAppListWindow() override;
|
| + AppListControllerDelegate* GetControllerDelegate() override;
|
| + Profile* GetCurrentAppListProfile() override;
|
| + void CreateShortcut() override;
|
|
|
| // AppListServiceImpl overrides:
|
| - virtual void CreateForProfile(Profile* requested_profile) override;
|
| - virtual void DestroyAppList() override;
|
| + void CreateForProfile(Profile* requested_profile) override;
|
| + void DestroyAppList() override;
|
|
|
| // AppShimHandler overrides:
|
| - virtual void OnShimLaunch(apps::AppShimHandler::Host* host,
|
| - apps::AppShimLaunchType launch_type,
|
| - const std::vector<base::FilePath>& files) override;
|
| - virtual void OnShimClose(apps::AppShimHandler::Host* host) override;
|
| - virtual void OnShimFocus(apps::AppShimHandler::Host* host,
|
| - apps::AppShimFocusType focus_type,
|
| - const std::vector<base::FilePath>& files) override;
|
| - virtual void OnShimSetHidden(apps::AppShimHandler::Host* host,
|
| - bool hidden) override;
|
| - virtual void OnShimQuit(apps::AppShimHandler::Host* host) override;
|
| + void OnShimLaunch(apps::AppShimHandler::Host* host,
|
| + apps::AppShimLaunchType launch_type,
|
| + const std::vector<base::FilePath>& files) override;
|
| + void OnShimClose(apps::AppShimHandler::Host* host) override;
|
| + void OnShimFocus(apps::AppShimHandler::Host* host,
|
| + apps::AppShimFocusType focus_type,
|
| + const std::vector<base::FilePath>& files) override;
|
| + void OnShimSetHidden(apps::AppShimHandler::Host* host, bool hidden) override;
|
| + void OnShimQuit(apps::AppShimHandler::Host* host) override;
|
|
|
| private:
|
| friend class test::AppListServiceMacTestApi;
|
|
|