chrome/browser/captive_portal/captive_portal_service_factory.h - Issue 625113002: replace OVERRIDE and FINAL with override and final in chrome/browser/[a-i]*

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/captive_portal/captive_portal_service_factory.h

Issue 625113002: replace OVERRIDE and FINAL with override and final in chrome/browser/[a-i]* (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: fix newly added OVERRIDEs 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/captive_portal/captive_portal_service.cc ('k') | chrome/browser/captive_portal/captive_portal_service_unittest.cc » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

OLD	NEW
1 // Copyright (c) 2012 The Chromium Authors. All rights reserved.	1 // Copyright (c) 2012 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_CAPTIVE_PORTAL_CAPTIVE_PORTAL_SERVICE_FACTORY_H_	5 #ifndef CHROME_BROWSER_CAPTIVE_PORTAL_CAPTIVE_PORTAL_SERVICE_FACTORY_H_

6 #define CHROME_BROWSER_CAPTIVE_PORTAL_CAPTIVE_PORTAL_SERVICE_FACTORY_H_	6 #define CHROME_BROWSER_CAPTIVE_PORTAL_CAPTIVE_PORTAL_SERVICE_FACTORY_H_

7	7

8 #include "base/basictypes.h"	8 #include "base/basictypes.h"

9 #include "base/compiler_specific.h"	9 #include "base/compiler_specific.h"

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

(...skipping 17 matching lines...) Expand all Loading...
28 private:	28 private:

29 friend class CaptivePortalBrowserTest;	29 friend class CaptivePortalBrowserTest;

30 friend class CaptivePortalServiceTest;	30 friend class CaptivePortalServiceTest;

31 friend struct DefaultSingletonTraits<CaptivePortalServiceFactory>;	31 friend struct DefaultSingletonTraits<CaptivePortalServiceFactory>;

32	32

33 CaptivePortalServiceFactory();	33 CaptivePortalServiceFactory();

34 virtual ~CaptivePortalServiceFactory();	34 virtual ~CaptivePortalServiceFactory();

35	35

36 // BrowserContextKeyedServiceFactory:	36 // BrowserContextKeyedServiceFactory:

37 virtual KeyedService* BuildServiceInstanceFor(	37 virtual KeyedService* BuildServiceInstanceFor(

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

39 virtual content::BrowserContext* GetBrowserContextToUse(	39 virtual content::BrowserContext* GetBrowserContextToUse(

40 content::BrowserContext* context) const OVERRIDE;	40 content::BrowserContext* context) const override;

41	41

42 DISALLOW_COPY_AND_ASSIGN(CaptivePortalServiceFactory);	42 DISALLOW_COPY_AND_ASSIGN(CaptivePortalServiceFactory);

43 };	43 };

44	44

45 #endif // CHROME_BROWSER_CAPTIVE_PORTAL_CAPTIVE_PORTAL_SERVICE_FACTORY_H_	45 #endif // CHROME_BROWSER_CAPTIVE_PORTAL_CAPTIVE_PORTAL_SERVICE_FACTORY_H_

OLD	NEW