Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(1347)

Side by Side Diff: chrome/browser/captive_portal/captive_portal_service_factory.h

Issue 15517005: Remove references to Profile from browser_context_keyed_service. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: rebase & style Created 7 years, 7 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 | Annotate | Revision Log
OLDNEW
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"
11 #include "components/browser_context_keyed_service/browser_context_keyed_service _factory.h" 11 #include "components/browser_context_keyed_service/browser_context_keyed_service _factory.h"
12 12
13 class Profile; 13 class Profile;
14 14
15 namespace captive_portal { 15 namespace captive_portal {
16 16
17 class CaptivePortalService; 17 class CaptivePortalService;
18 18
19 // Singleton that owns all CaptivePortalServices and associates them with 19 // Singleton that owns all CaptivePortalServices and associates them with
20 // Profiles. Listens for the Profile's destruction notification and cleans up 20 // Profiles. Listens for the Profile's destruction notification and cleans up
21 // the associated CaptivePortalService. Incognito profiles have their own 21 // the associated CaptivePortalService. Incognito profiles have their own
22 // CaptivePortalService. 22 // CaptivePortalService.
23 class CaptivePortalServiceFactory : public ProfileKeyedServiceFactory { 23 class CaptivePortalServiceFactory : public BrowserContextKeyedServiceFactory {
24 public: 24 public:
25 // Returns the CaptivePortalService for |profile|. 25 // Returns the CaptivePortalService for |profile|.
26 static CaptivePortalService* GetForProfile(Profile* profile); 26 static CaptivePortalService* GetForProfile(Profile* profile);
27 27
28 static CaptivePortalServiceFactory* GetInstance(); 28 static CaptivePortalServiceFactory* GetInstance();
29 29
30 private: 30 private:
31 friend class CaptivePortalBrowserTest; 31 friend class CaptivePortalBrowserTest;
32 friend class CaptivePortalServiceTest; 32 friend class CaptivePortalServiceTest;
33 friend struct DefaultSingletonTraits<CaptivePortalServiceFactory>; 33 friend struct DefaultSingletonTraits<CaptivePortalServiceFactory>;
34 34
35 CaptivePortalServiceFactory(); 35 CaptivePortalServiceFactory();
36 virtual ~CaptivePortalServiceFactory(); 36 virtual ~CaptivePortalServiceFactory();
37 37
38 // ProfileKeyedServiceFactory: 38 // BrowserContextKeyedServiceFactory:
39 virtual ProfileKeyedService* BuildServiceInstanceFor( 39 virtual BrowserContextKeyedService* BuildServiceInstanceFor(
40 content::BrowserContext* profile) const OVERRIDE; 40 content::BrowserContext* profile) const OVERRIDE;
41 virtual content::BrowserContext* GetBrowserContextToUse( 41 virtual content::BrowserContext* GetBrowserContextToUse(
42 content::BrowserContext* context) const OVERRIDE; 42 content::BrowserContext* context) const OVERRIDE;
43 43
44 DISALLOW_COPY_AND_ASSIGN(CaptivePortalServiceFactory); 44 DISALLOW_COPY_AND_ASSIGN(CaptivePortalServiceFactory);
45 }; 45 };
46 46
47 } // namespace captive_portal 47 } // namespace captive_portal
48 48
49 #endif // CHROME_BROWSER_CAPTIVE_PORTAL_CAPTIVE_PORTAL_SERVICE_FACTORY_H_ 49 #endif // CHROME_BROWSER_CAPTIVE_PORTAL_CAPTIVE_PORTAL_SERVICE_FACTORY_H_
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698