chrome/browser/signin/account_reconcilor_factory.h - Issue 629603002: replace OVERRIDE and FINAL with override and final in chrome/browser/[r-z]*

Side by Side Diff

Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.

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

Side by Side Diff: chrome/browser/signin/account_reconcilor_factory.h

Issue 629603002: replace OVERRIDE and FINAL with override and final in chrome/browser/[r-z]* (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 unified diff | Download patch

« no previous file with comments | « chrome/browser/signin/about_signin_internals_factory.h ('k') | chrome/browser/signin/account_reconcilor_unittest.cc » ('j') | no next file with comments »

OLD	NEW
1 // Copyright 2013 The Chromium Authors. All rights reserved.	1 // Copyright 2013 The Chromium Authors. All rights reserved.

2 // Use of this source code is governed by a BSD-style license that can be	2 // Use of this source code is governed by a BSD-style license that can be

3 // found in the LICENSE file.	3 // found in the LICENSE file.

4	4

5 #ifndef CHROME_BROWSER_SIGNIN_ACCOUNT_RECONCILOR_FACTORY_H_	5 #ifndef CHROME_BROWSER_SIGNIN_ACCOUNT_RECONCILOR_FACTORY_H_

6 #define CHROME_BROWSER_SIGNIN_ACCOUNT_RECONCILOR_FACTORY_H_	6 #define CHROME_BROWSER_SIGNIN_ACCOUNT_RECONCILOR_FACTORY_H_

7	7

8 #include "base/memory/singleton.h"	8 #include "base/memory/singleton.h"

9 #include "components/keyed_service/content/browser_context_keyed_service_factory .h"	9 #include "components/keyed_service/content/browser_context_keyed_service_factory .h"

10 #include "components/signin/core/browser/account_reconcilor.h"	10 #include "components/signin/core/browser/account_reconcilor.h"

(...skipping 14 matching lines...) Expand all Loading...
25 static AccountReconcilorFactory* GetInstance();	25 static AccountReconcilorFactory* GetInstance();

26	26

27 private:	27 private:

28 friend struct DefaultSingletonTraits<AccountReconcilorFactory>;	28 friend struct DefaultSingletonTraits<AccountReconcilorFactory>;

29	29

30 AccountReconcilorFactory();	30 AccountReconcilorFactory();

31 virtual ~AccountReconcilorFactory();	31 virtual ~AccountReconcilorFactory();

32	32

33 // BrowserContextKeyedServiceFactory:	33 // BrowserContextKeyedServiceFactory:

34 virtual KeyedService* BuildServiceInstanceFor(	34 virtual KeyedService* BuildServiceInstanceFor(

35 content::BrowserContext* profile) const OVERRIDE;	35 content::BrowserContext* profile) const override;

36 virtual void RegisterProfilePrefs(	36 virtual void RegisterProfilePrefs(

37 user_prefs::PrefRegistrySyncable* registry) OVERRIDE;	37 user_prefs::PrefRegistrySyncable* registry) override;

38 };	38 };

39	39

40 #endif // CHROME_BROWSER_SIGNIN_ACCOUNT_RECONCILOR_FACTORY_H_	40 #endif // CHROME_BROWSER_SIGNIN_ACCOUNT_RECONCILOR_FACTORY_H_

OLD	NEW