| Index: athena/extensions/chrome/app_list_controller_delegate_athena.h
|
| diff --git a/athena/extensions/chrome/app_list_controller_delegate_athena.h b/athena/extensions/chrome/app_list_controller_delegate_athena.h
|
| index 78c6de1065d857706df6347ead7be8619f682f3a..07a397928508ee0be239f3fce58a73a836919a6d 100644
|
| --- a/athena/extensions/chrome/app_list_controller_delegate_athena.h
|
| +++ b/athena/extensions/chrome/app_list_controller_delegate_athena.h
|
| @@ -14,39 +14,39 @@ namespace athena {
|
| class AppListControllerDelegateAthena : public AppListControllerDelegate {
|
| public:
|
| AppListControllerDelegateAthena();
|
| - virtual ~AppListControllerDelegateAthena();
|
| + ~AppListControllerDelegateAthena() override;
|
|
|
| private:
|
| // AppListControllerDelegate overrides:
|
| - virtual void DismissView() override;
|
| - virtual gfx::NativeWindow GetAppListWindow() override;
|
| - virtual gfx::Rect GetAppListBounds() override;
|
| - virtual gfx::ImageSkia GetWindowIcon() override;
|
| - virtual bool IsAppPinned(const std::string& extension_id) override;
|
| - virtual void PinApp(const std::string& extension_id) override;
|
| - virtual void UnpinApp(const std::string& extension_id) override;
|
| - virtual Pinnable GetPinnable() override;
|
| - virtual void OnShowChildDialog() override;
|
| - virtual void OnCloseChildDialog() override;
|
| - virtual bool CanDoCreateShortcutsFlow() override;
|
| - virtual void DoCreateShortcutsFlow(Profile* profile,
|
| + void DismissView() override;
|
| + gfx::NativeWindow GetAppListWindow() override;
|
| + gfx::Rect GetAppListBounds() override;
|
| + gfx::ImageSkia GetWindowIcon() override;
|
| + bool IsAppPinned(const std::string& extension_id) override;
|
| + void PinApp(const std::string& extension_id) override;
|
| + void UnpinApp(const std::string& extension_id) override;
|
| + Pinnable GetPinnable() override;
|
| + void OnShowChildDialog() override;
|
| + void OnCloseChildDialog() override;
|
| + bool CanDoCreateShortcutsFlow() override;
|
| + void DoCreateShortcutsFlow(Profile* profile,
|
| const std::string& extension_id) override;
|
| - virtual void CreateNewWindow(Profile* profile, bool incognito) override;
|
| - virtual void OpenURL(Profile* profile,
|
| + void CreateNewWindow(Profile* profile, bool incognito) override;
|
| + void OpenURL(Profile* profile,
|
| const GURL& url,
|
| ui::PageTransition transition,
|
| WindowOpenDisposition disposition) override;
|
| - virtual void ActivateApp(Profile* profile,
|
| + void ActivateApp(Profile* profile,
|
| const extensions::Extension* extension,
|
| AppListSource source,
|
| int event_flags) override;
|
| - virtual void LaunchApp(Profile* profile,
|
| + void LaunchApp(Profile* profile,
|
| const extensions::Extension* extension,
|
| AppListSource source,
|
| int event_flags) override;
|
| - virtual void ShowForProfileByPath(
|
| + void ShowForProfileByPath(
|
| const base::FilePath& profile_path) override;
|
| - virtual bool ShouldShowUserIcon() override;
|
| + bool ShouldShowUserIcon() override;
|
|
|
| DISALLOW_COPY_AND_ASSIGN(AppListControllerDelegateAthena);
|
| };
|
|
|