| 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 20 matching lines...) Expand all Loading... |
| 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 // ProfileKeyedServiceFactory: |
| 39 virtual ProfileKeyedService* BuildServiceInstanceFor( | 39 virtual ProfileKeyedService* BuildServiceInstanceFor( |
| 40 content::BrowserContext* profile) const OVERRIDE; | 40 content::BrowserContext* profile) const OVERRIDE; |
| 41 virtual bool ServiceHasOwnInstanceInIncognito() const OVERRIDE; | 41 virtual content::BrowserContext* GetBrowserContextToUse( |
| 42 content::BrowserContext* context) const OVERRIDE; |
| 42 | 43 |
| 43 DISALLOW_COPY_AND_ASSIGN(CaptivePortalServiceFactory); | 44 DISALLOW_COPY_AND_ASSIGN(CaptivePortalServiceFactory); |
| 44 }; | 45 }; |
| 45 | 46 |
| 46 } // namespace captive_portal | 47 } // namespace captive_portal |
| 47 | 48 |
| 48 #endif // CHROME_BROWSER_CAPTIVE_PORTAL_CAPTIVE_PORTAL_SERVICE_FACTORY_H_ | 49 #endif // CHROME_BROWSER_CAPTIVE_PORTAL_CAPTIVE_PORTAL_SERVICE_FACTORY_H_ |
| OLD | NEW |