ui/views/layout/box_layout.h - Issue 623293004: replace OVERRIDE and FINAL with override and final in ui/

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: ui/views/layout/box_layout.h

Issue 623293004: replace OVERRIDE and FINAL with override and final in ui/ (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: rebase on master 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

Index: ui/views/layout/box_layout.h

diff --git a/ui/views/layout/box_layout.h b/ui/views/layout/box_layout.h

index 1bcbcf958438e6d62498ff28aa904d64c4c612ea..b07afafe5cbb6f288ae8f4929658e58bba3249b0 100644

--- a/ui/views/layout/box_layout.h

+++ b/ui/views/layout/box_layout.h

@@ -98,13 +98,13 @@ class VIEWS_EXPORT BoxLayout : public LayoutManager {

void SetDefaultFlex(int default_flex);

// Overridden from views::LayoutManager:

- virtual void Installed(View* host) OVERRIDE;

- virtual void Uninstalled(View* host) OVERRIDE;

- virtual void ViewRemoved(View* host, View* view) OVERRIDE;

- virtual void Layout(View* host) OVERRIDE;

- virtual gfx::Size GetPreferredSize(const View* host) const OVERRIDE;

+ virtual void Installed(View* host) override;

+ virtual void Uninstalled(View* host) override;

+ virtual void ViewRemoved(View* host, View* view) override;

+ virtual void Layout(View* host) override;

+ virtual gfx::Size GetPreferredSize(const View* host) const override;

virtual int GetPreferredHeightForWidth(const View* host,

- int width) const OVERRIDE;

+ int width) const override;

private:

// Returns the flex for the specified |view|.

« no previous file with comments | « ui/views/ime/null_input_method.h ('k') | ui/views/layout/box_layout_unittest.cc » ('j') | no next file with comments »