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

Unified Diff: chrome/browser/signin/signin_manager_factory.cc

Issue 14367029: Introduce SigninManagerDelegate and use to eliminate CookieSettings dependency. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Merge LKGR Created 7 years, 8 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 side-by-side diff with in-line comments
Download patch
« no previous file with comments | « chrome/browser/signin/signin_manager_delegate.h ('k') | chrome/browser/signin/signin_manager_unittest.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/browser/signin/signin_manager_factory.cc
diff --git a/chrome/browser/signin/signin_manager_factory.cc b/chrome/browser/signin/signin_manager_factory.cc
index dec9725d579a23421d0c1b09c51a145c44b90cb8..2fe2342355898e8c26cb5aabd9ca6766650978a7 100644
--- a/chrome/browser/signin/signin_manager_factory.cc
+++ b/chrome/browser/signin/signin_manager_factory.cc
@@ -6,6 +6,7 @@
#include "base/prefs/pref_registry_simple.h"
#include "chrome/browser/profiles/profile_dependency_manager.h"
+#include "chrome/browser/signin/chrome_signin_manager_delegate.h"
#include "chrome/browser/signin/signin_manager.h"
#include "chrome/browser/signin/token_service_factory.h"
#include "chrome/browser/ui/global_error/global_error_service_factory.h"
@@ -78,13 +79,16 @@ void SigninManagerFactory::RegisterPrefs(PrefRegistrySimple* registry) {
}
ProfileKeyedService* SigninManagerFactory::BuildServiceInstanceFor(
- content::BrowserContext* profile) const {
+ content::BrowserContext* context) const {
SigninManagerBase* service = NULL;
+ Profile* profile = static_cast<Profile*>(context);
#if defined(OS_CHROMEOS)
service = new SigninManagerBase();
#else
- service = new SigninManager();
+ service = new SigninManager(
+ scoped_ptr<SigninManagerDelegate>(
+ new ChromeSigninManagerDelegate(profile)));
#endif
- service->Initialize(static_cast<Profile*>(profile));
+ service->Initialize(profile);
return service;
}
« no previous file with comments | « chrome/browser/signin/signin_manager_delegate.h ('k') | chrome/browser/signin/signin_manager_unittest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698