chrome/browser/ui/views/toolbar/browser_actions_container_browsertest.cc - Issue 628773002: replace OVERRIDE and FINAL with override and final in chrome/browser/ui/[t-v]*

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/views/toolbar/browser_actions_container_browsertest.cc

Issue 628773002: replace OVERRIDE and FINAL with override and final in chrome/browser/ui/[t-v]* (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/views/toolbar/browser_actions_container.h ('k') | chrome/browser/ui/views/toolbar/chevron_menu_button.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: chrome/browser/ui/views/toolbar/browser_actions_container_browsertest.cc

diff --git a/chrome/browser/ui/views/toolbar/browser_actions_container_browsertest.cc b/chrome/browser/ui/views/toolbar/browser_actions_container_browsertest.cc

index 078759a3eb16998cf20fc18168484ddebf727fa6..3bf5a3dcd6f1116fbe34bda30bf3daf149237796 100644

--- a/chrome/browser/ui/views/toolbar/browser_actions_container_browsertest.cc

+++ b/chrome/browser/ui/views/toolbar/browser_actions_container_browsertest.cc

@@ -56,17 +56,17 @@ class BrowserActionsContainerTest : public ExtensionBrowserTest {

virtual ~BrowserActionsContainerTest() {}

protected:

- virtual void SetUpCommandLine(base::CommandLine* command_line) OVERRIDE {

+ virtual void SetUpCommandLine(base::CommandLine* command_line) override {

BrowserActionsContainer::disable_animations_during_testing_ = true;

ExtensionBrowserTest::SetUpCommandLine(command_line);

}

- virtual void SetUpOnMainThread() OVERRIDE {

+ virtual void SetUpOnMainThread() override {

ExtensionBrowserTest::SetUpOnMainThread();

browser_actions_bar_.reset(new BrowserActionTestUtil(browser()));

}

- virtual void TearDownOnMainThread() OVERRIDE {

+ virtual void TearDownOnMainThread() override {

BrowserActionsContainer::disable_animations_during_testing_ = false;

ExtensionBrowserTest::TearDownOnMainThread();

}

@@ -453,9 +453,9 @@ class BrowserActionsContainerOverflowTest : public BrowserActionsContainerTest {

extensions::ExtensionToolbarModel* model() { return model_; }

private:

- virtual void SetUpCommandLine(base::CommandLine* command_line) OVERRIDE;

- virtual void SetUpOnMainThread() OVERRIDE;

- virtual void TearDownOnMainThread() OVERRIDE;

+ virtual void SetUpCommandLine(base::CommandLine* command_line) override;

+ virtual void SetUpOnMainThread() override;

+ virtual void TearDownOnMainThread() override;

// The main BrowserActionsContainer (owned by the browser view).

BrowserActionsContainer* main_bar_;