chrome/browser/chromeos/login/screens/mock_network_screen.h - Issue 1100223002: Update {virtual,override} to follow C++11 style in chrome.

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/chromeos/login/screens/mock_network_screen.h

Issue 1100223002: Update {virtual,override} to follow C++11 style in chrome. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: Rebase Created 5 years, 8 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/chromeos/login/screens/mock_eula_screen.h ('k') | chrome/browser/chromeos/login/screens/mock_wrong_hwid_screen.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: chrome/browser/chromeos/login/screens/mock_network_screen.h

diff --git a/chrome/browser/chromeos/login/screens/mock_network_screen.h b/chrome/browser/chromeos/login/screens/mock_network_screen.h

index bcb4f9007ad99a52b10573c267669cac58289978..9ccae6bd855aed8d12cd69ab398b4a6438dd16d7 100644

--- a/chrome/browser/chromeos/login/screens/mock_network_screen.h

+++ b/chrome/browser/chromeos/login/screens/mock_network_screen.h

@@ -17,7 +17,7 @@ class MockNetworkScreen : public NetworkScreen {

MockNetworkScreen(BaseScreenDelegate* base_screen_delegate,

Delegate* delegate,

NetworkView* view);

- virtual ~MockNetworkScreen();

+ ~MockNetworkScreen() override;

MOCK_METHOD0(Show, void());

MOCK_METHOD0(Hide, void());

@@ -26,10 +26,10 @@ class MockNetworkScreen : public NetworkScreen {

class MockNetworkView : public NetworkView {

public:

MockNetworkView();

- virtual ~MockNetworkView();

+ ~MockNetworkView() override;

- virtual void Bind(NetworkModel& model) override;

- virtual void Unbind() override;

+ void Bind(NetworkModel& model) override;

+ void Unbind() override;

MOCK_METHOD1(MockBind, void(NetworkModel& model));

MOCK_METHOD0(MockUnbind, void());