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

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

Unified Diff: chrome/browser/ui/ash/launcher/app_window_launcher_item_controller.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/launcher/app_window_launcher_controller.h ('k') | chrome/browser/ui/ash/launcher/browser_shortcut_launcher_item_controller.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: chrome/browser/ui/ash/launcher/app_window_launcher_item_controller.h

diff --git a/chrome/browser/ui/ash/launcher/app_window_launcher_item_controller.h b/chrome/browser/ui/ash/launcher/app_window_launcher_item_controller.h

index ae6dfe73277d61a9fff5d79ea5ddb34c32e42b62..0e815b2cb44477270fe3a42ade180c7c0880672d 100644

--- a/chrome/browser/ui/ash/launcher/app_window_launcher_item_controller.h

+++ b/chrome/browser/ui/ash/launcher/app_window_launcher_item_controller.h

@@ -53,24 +53,24 @@ class AppWindowLauncherItemController : public LauncherItemController,

const std::string& app_shelf_id() const { return app_shelf_id_; }

// LauncherItemController overrides:

- virtual bool IsOpen() const OVERRIDE;

- virtual bool IsVisible() const OVERRIDE;

- virtual void Launch(ash::LaunchSource source, int event_flags) OVERRIDE;

- virtual bool Activate(ash::LaunchSource source) OVERRIDE;

+ virtual bool IsOpen() const override;

+ virtual bool IsVisible() const override;

+ virtual void Launch(ash::LaunchSource source, int event_flags) override;

+ virtual bool Activate(ash::LaunchSource source) override;

virtual ChromeLauncherAppMenuItems GetApplicationList(int event_flags)

- OVERRIDE;

- virtual bool ItemSelected(const ui::Event& eent) OVERRIDE;

- virtual base::string16 GetTitle() OVERRIDE;

- virtual ui::MenuModel* CreateContextMenu(aura::Window* root_window) OVERRIDE;

- virtual ash::ShelfMenuModel* CreateApplicationMenu(int event_flags) OVERRIDE;

- virtual bool IsDraggable() OVERRIDE;

- virtual bool ShouldShowTooltip() OVERRIDE;

- virtual void Close() OVERRIDE;

+ override;

+ virtual bool ItemSelected(const ui::Event& eent) override;

+ virtual base::string16 GetTitle() override;

+ virtual ui::MenuModel* CreateContextMenu(aura::Window* root_window) override;

+ virtual ash::ShelfMenuModel* CreateApplicationMenu(int event_flags) override;

+ virtual bool IsDraggable() override;

+ virtual bool ShouldShowTooltip() override;

+ virtual void Close() override;

// aura::WindowObserver overrides:

virtual void OnWindowPropertyChanged(aura::Window* window,

const void* key,

- intptr_t old) OVERRIDE;

+ intptr_t old) override;

// Get the number of running applications/incarnations of this.

size_t app_window_count() const { return app_windows_.size(); }