chrome/browser/ui/ash/app_list/app_list_controller_ash.h - Issue 627043002: replace OVERRIDE and FINAL with override and final in chrome/browser/ui/[a-s]*

Unified Diff: chrome/browser/ui/ash/app_list/app_list_controller_ash.h

Issue 627043002: replace OVERRIDE and FINAL with override and final in chrome/browser/ui/[a-s]* (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: Created 6 years, 2 months ago

Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.

Jump to:

View side-by-side diff with in-line comments

Download patch

« no previous file with comments | « chrome/browser/ui/ash/accessibility/ax_tree_source_ash_unittest.cc ('k') | chrome/browser/ui/ash/app_list/app_list_service_ash.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

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 7c0552ffd2c38d2af3c80f18a1ac92df62848981..19f842d0b29bf1af63cf5d0bcf2403212de0a522 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

@@ -17,31 +17,31 @@ class AppListControllerDelegateAsh : public AppListControllerDelegate {

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 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;

+ const std::string& extension_id) override;

+ virtual void CreateNewWindow(Profile* profile, bool incognito) override;

virtual void ActivateApp(Profile* profile,

const extensions::Extension* extension,

AppListSource source,

- int event_flags) OVERRIDE;

+ int event_flags) override;

virtual void LaunchApp(Profile* profile,

const extensions::Extension* extension,

AppListSource source,

- int event_flags) OVERRIDE;

+ int event_flags) override;

virtual void ShowForProfileByPath(

- const base::FilePath& profile_path) OVERRIDE;

- virtual bool ShouldShowUserIcon() OVERRIDE;

+ const base::FilePath& profile_path) override;

+ virtual bool ShouldShowUserIcon() override;

ash::LaunchSource AppListSourceToLaunchSource(AppListSource source);