| Index: chrome/browser/ui/ash/app_list/app_list_controller_ash.h
|
| diff --git a/chrome/browser/ui/ash/app_list/app_list_controller_ash.h b/chrome/browser/ui/ash/app_list/app_list_controller_ash.h
|
| index 9be7ae330c66e0f62cd1b9220451261a65bfc546..2d061786e745ee4fb4eb5a889dd4494c3d3ec30f 100644
|
| --- a/chrome/browser/ui/ash/app_list/app_list_controller_ash.h
|
| +++ b/chrome/browser/ui/ash/app_list/app_list_controller_ash.h
|
| @@ -13,39 +13,38 @@
|
| class AppListControllerDelegateAsh : public AppListControllerDelegate {
|
| public:
|
| AppListControllerDelegateAsh();
|
| - virtual ~AppListControllerDelegateAsh();
|
| + ~AppListControllerDelegateAsh() 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,
|
| - const std::string& extension_id) override;
|
| - virtual void CreateNewWindow(Profile* profile, bool incognito) override;
|
| - virtual void OpenURL(Profile* profile,
|
| - const GURL& url,
|
| - ui::PageTransition transition,
|
| - WindowOpenDisposition disposition) override;
|
| - virtual void ActivateApp(Profile* profile,
|
| - const extensions::Extension* extension,
|
| - AppListSource source,
|
| - int event_flags) override;
|
| - virtual void LaunchApp(Profile* profile,
|
| - const extensions::Extension* extension,
|
| - AppListSource source,
|
| - int event_flags) override;
|
| - virtual void ShowForProfileByPath(
|
| - const base::FilePath& profile_path) override;
|
| - virtual bool ShouldShowUserIcon() override;
|
| + 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;
|
| + void CreateNewWindow(Profile* profile, bool incognito) override;
|
| + void OpenURL(Profile* profile,
|
| + const GURL& url,
|
| + ui::PageTransition transition,
|
| + WindowOpenDisposition disposition) override;
|
| + void ActivateApp(Profile* profile,
|
| + const extensions::Extension* extension,
|
| + AppListSource source,
|
| + int event_flags) override;
|
| + void LaunchApp(Profile* profile,
|
| + const extensions::Extension* extension,
|
| + AppListSource source,
|
| + int event_flags) override;
|
| + void ShowForProfileByPath(const base::FilePath& profile_path) override;
|
| + bool ShouldShowUserIcon() override;
|
|
|
| ash::LaunchSource AppListSourceToLaunchSource(AppListSource source);
|
|
|
|
|