chrome/browser/chromeos/login/signin/merge_session_load_page.h - Issue 623293003: replace OVERRIDE and FINAL with override and final in chrome/browser/chromeos/

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/signin/merge_session_load_page.h

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

Patch Set: run git cl format on echo_dialog_view.h 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/chromeos/login/signin/auth_sync_observer_factory.h ('k') | chrome/browser/chromeos/login/signin/merge_session_load_page_unittest.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: chrome/browser/chromeos/login/signin/merge_session_load_page.h

diff --git a/chrome/browser/chromeos/login/signin/merge_session_load_page.h b/chrome/browser/chromeos/login/signin/merge_session_load_page.h

index b07390eecc1b41c88956bec2a12a222d7dad74fd..d62209988e5ca15614d2ec52e9491165c1e4d9cd 100644

--- a/chrome/browser/chromeos/login/signin/merge_session_load_page.h

+++ b/chrome/browser/chromeos/login/signin/merge_session_load_page.h

@@ -53,17 +53,17 @@ class MergeSessionLoadPage

friend class TestMergeSessionLoadPage;

// InterstitialPageDelegate implementation.

- virtual std::string GetHTMLContents() OVERRIDE;

- virtual void CommandReceived(const std::string& command) OVERRIDE;

+ virtual std::string GetHTMLContents() override;

+ virtual void CommandReceived(const std::string& command) override;

virtual void OverrideRendererPrefs(

- content::RendererPreferences* prefs) OVERRIDE;

- virtual void OnProceed() OVERRIDE;

- virtual void OnDontProceed() OVERRIDE;

+ content::RendererPreferences* prefs) override;

+ virtual void OnProceed() override;

+ virtual void OnDontProceed() override;

// OAuth2LoginManager::Observer overrides.

virtual void OnSessionRestoreStateChanged(

Profile* user_profile,

- OAuth2LoginManager::SessionRestoreState state) OVERRIDE;

+ OAuth2LoginManager::SessionRestoreState state) override;

void NotifyBlockingPageComplete();