| Index: mojo/services/view_manager/default_access_policy.h
|
| diff --git a/mojo/services/view_manager/default_access_policy.h b/mojo/services/view_manager/default_access_policy.h
|
| index 197736aeddadc293313c58ae32f061ae20441545..d8c0194d2a4ae1353fa73b78a4f949a48c1936d7 100644
|
| --- a/mojo/services/view_manager/default_access_policy.h
|
| +++ b/mojo/services/view_manager/default_access_policy.h
|
| @@ -21,24 +21,24 @@ class DefaultAccessPolicy : public AccessPolicy {
|
| virtual ~DefaultAccessPolicy();
|
|
|
| // 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 IsViewInRoots(const ServerView* view) const;
|
|
|