mojo/services/view_manager/window_manager_access_policy.h - Issue 634483003: replace OVERRIDE and FINAL with override and final in mojo/

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: mojo/services/view_manager/window_manager_access_policy.h

Issue 634483003: replace OVERRIDE and FINAL with override and final in mojo/ (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

« mojo/services/view_manager/view_manager_service_impl.h ('K') | « mojo/services/view_manager/view_manager_unittest.cc ('k') | mojo/services/window_manager/window_manager_app.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: mojo/services/view_manager/window_manager_access_policy.h

diff --git a/mojo/services/view_manager/window_manager_access_policy.h b/mojo/services/view_manager/window_manager_access_policy.h

index 5730a18b96bb1ed5fc9fcf362b3845220ec0c7b7..aa44fd62f7e3fc6d2bb5b32508de51a15e052e2c 100644

--- a/mojo/services/view_manager/window_manager_access_policy.h

+++ b/mojo/services/view_manager/window_manager_access_policy.h

@@ -20,24 +20,24 @@ class WindowManagerAccessPolicy : public AccessPolicy {

virtual ~WindowManagerAccessPolicy();

// AccessPolicy:

- virtual bool CanRemoveViewFromParent(const ServerView* view) const OVERRIDE;

+ virtual bool CanRemoveViewFromParent(const ServerView* view) const override;

virtual bool CanAddView(const ServerView* parent,

- const ServerView* child) const OVERRIDE;

+ const ServerView* child) const override;

virtual bool CanReorderView(const ServerView* view,

const ServerView* relative_view,

- OrderDirection direction) const OVERRIDE;

- virtual bool CanDeleteView(const ServerView* view) const OVERRIDE;

- virtual bool CanGetViewTree(const ServerView* view) const OVERRIDE;

+ OrderDirection direction) const override;

+ virtual bool CanDeleteView(const ServerView* view) const override;

+ virtual bool CanGetViewTree(const ServerView* view) const override;

virtual bool CanDescendIntoViewForViewTree(

- const ServerView* view) const OVERRIDE;

- virtual bool CanEmbed(const ServerView* view) const OVERRIDE;

- virtual bool CanChangeViewVisibility(const ServerView* view) const OVERRIDE;

- virtual bool CanSetViewSurfaceId(const ServerView* view) const OVERRIDE;

- virtual bool CanSetViewBounds(const ServerView* view) const OVERRIDE;

+ const ServerView* view) const override;

+ virtual bool CanEmbed(const ServerView* view) const override;

+ virtual bool CanChangeViewVisibility(const ServerView* view) const override;

+ virtual bool CanSetViewSurfaceId(const ServerView* view) const override;

+ virtual bool CanSetViewBounds(const ServerView* view) const override;

virtual bool ShouldNotifyOnHierarchyChange(

const ServerView* view,

const ServerView** new_parent,

- const ServerView** old_parent) const OVERRIDE;

+ const ServerView** old_parent) const override;

private:

bool IsViewKnown(const ServerView* view) const;