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

Unified Diff: chrome/browser/sync/profile_sync_service_factory.cc

Issue 12077030: Allow signin to continue even if sync is disabled by policy. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Fix windows sync integration test failure Created 7 years, 11 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/sync/profile_sync_service.cc ('k') | chrome/browser/sync/profile_sync_service_mock.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/browser/sync/profile_sync_service_factory.cc
diff --git a/chrome/browser/sync/profile_sync_service_factory.cc b/chrome/browser/sync/profile_sync_service_factory.cc
index ca81dd1159d5efe712584eb510dd129b718360b9..a1966f143b8434d66f8681998bedca7f9403752a 100644
--- a/chrome/browser/sync/profile_sync_service_factory.cc
+++ b/chrome/browser/sync/profile_sync_service_factory.cc
@@ -17,6 +17,7 @@
#include "chrome/browser/profiles/profile_dependency_manager.h"
#include "chrome/browser/search_engines/template_url_service_factory.h"
#include "chrome/browser/sessions/tab_restore_service_factory.h"
+#include "chrome/browser/signin/about_signin_internals_factory.h"
#include "chrome/browser/signin/signin_manager.h"
#include "chrome/browser/signin/signin_manager_factory.h"
#include "chrome/browser/sync/profile_sync_components_factory_impl.h"
@@ -67,6 +68,7 @@ ProfileSyncServiceFactory::ProfileSyncServiceFactory()
DependsOn(WebDataServiceFactory::GetInstance());
DependsOn(HistoryServiceFactory::GetInstance());
DependsOn(BookmarkModelFactory::GetInstance());
+ DependsOn(AboutSigninInternalsFactory::GetInstance());
// The following have not been converted to ProfileKeyedServices yet, and for
// now they are explicitly destroyed after the ProfileDependencyManager is
@@ -87,6 +89,10 @@ ProfileKeyedService* ProfileSyncServiceFactory::BuildServiceInstanceFor(
SigninManager* signin = SigninManagerFactory::GetForProfile(profile);
+ // TODO(atwilson): Change AboutSigninInternalsFactory to load on startup
+ // once http://crbug.com/171406 has been fixed.
+ AboutSigninInternalsFactory::GetForProfile(profile);
+
// TODO(tim): Currently, AUTO/MANUAL settings refer to the *first* time sync
// is set up and *not* a browser restart for a manual-start platform (where
// sync has already been set up, and should be able to start without user
« no previous file with comments | « chrome/browser/sync/profile_sync_service.cc ('k') | chrome/browser/sync/profile_sync_service_mock.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698