| 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 #include "chrome/browser/captive_portal/captive_portal_service_factory.h" | 5 #include "chrome/browser/captive_portal/captive_portal_service_factory.h" |
| 6 | 6 |
| 7 #include "chrome/browser/captive_portal/captive_portal_service.h" | 7 #include "chrome/browser/captive_portal/captive_portal_service.h" |
| 8 #include "chrome/browser/profiles/incognito_helpers.h" |
| 8 #include "chrome/browser/profiles/profile.h" | 9 #include "chrome/browser/profiles/profile.h" |
| 9 #include "chrome/browser/profiles/profile_dependency_manager.h" | 10 #include "chrome/browser/profiles/profile_dependency_manager.h" |
| 10 | 11 |
| 11 namespace captive_portal { | 12 namespace captive_portal { |
| 12 | 13 |
| 13 // static | 14 // static |
| 14 CaptivePortalService* CaptivePortalServiceFactory::GetForProfile( | 15 CaptivePortalService* CaptivePortalServiceFactory::GetForProfile( |
| 15 Profile* profile) { | 16 Profile* profile) { |
| 16 return static_cast<CaptivePortalService*>( | 17 return static_cast<CaptivePortalService*>( |
| 17 GetInstance()->GetServiceForProfile(profile, true)); | 18 GetInstance()->GetServiceForProfile(profile, true)); |
| (...skipping 10 matching lines...) Expand all Loading... |
| 28 } | 29 } |
| 29 | 30 |
| 30 CaptivePortalServiceFactory::~CaptivePortalServiceFactory() { | 31 CaptivePortalServiceFactory::~CaptivePortalServiceFactory() { |
| 31 } | 32 } |
| 32 | 33 |
| 33 ProfileKeyedService* CaptivePortalServiceFactory::BuildServiceInstanceFor( | 34 ProfileKeyedService* CaptivePortalServiceFactory::BuildServiceInstanceFor( |
| 34 content::BrowserContext* profile) const { | 35 content::BrowserContext* profile) const { |
| 35 return new CaptivePortalService(static_cast<Profile*>(profile)); | 36 return new CaptivePortalService(static_cast<Profile*>(profile)); |
| 36 } | 37 } |
| 37 | 38 |
| 38 bool CaptivePortalServiceFactory::ServiceHasOwnInstanceInIncognito() const { | 39 content::BrowserContext* CaptivePortalServiceFactory::GetBrowserContextToUse( |
| 39 return true; | 40 content::BrowserContext* context) const { |
| 41 return chrome::GetBrowserContextOwnInstanceInIncognito(context); |
| 40 } | 42 } |
| 41 | 43 |
| 42 } // namespace captive_portal | 44 } // namespace captive_portal |
| OLD | NEW |