Index: chrome/browser/extensions/external_pref_loader.cc |
diff --git a/chrome/browser/extensions/external_pref_loader.cc b/chrome/browser/extensions/external_pref_loader.cc |
index 61be1597a954c58f24198a971bfc220a8f3c3cf8..b303caf020978a71c91909fdbe8aa5d36f9d94fa 100644 |
--- a/chrome/browser/extensions/external_pref_loader.cc |
+++ b/chrome/browser/extensions/external_pref_loader.cc |
@@ -16,6 +16,7 @@ |
#include "base/strings/string_util.h" |
#include "base/strings/utf_string_conversions.h" |
#include "chrome/browser/prefs/pref_service_syncable.h" |
+#include "chrome/browser/sync/profile_sync_service_factory.h" |
#include "chrome/common/chrome_paths.h" |
#include "content/public/browser/browser_thread.h" |
@@ -113,12 +114,20 @@ const base::FilePath ExternalPrefLoader::GetBaseCrxFilePath() { |
void ExternalPrefLoader::StartLoading() { |
CHECK(BrowserThread::CurrentlyOn(BrowserThread::UI)); |
- if (options_ & DELAY_LOAD_UNTIL_PRIORITY_SYNC) { |
+ if ((options_ & DELAY_LOAD_UNTIL_PRIORITY_SYNC) && |
+ (profile_ && profile_->IsSyncAccessible())) { |
if (!PostLoadIfPrioritySyncReady()) { |
DCHECK(profile_); |
PrefServiceSyncable* prefs = PrefServiceSyncable::FromProfile(profile_); |
DCHECK(prefs); |
syncable_pref_observer_.Add(prefs); |
+ ProfileSyncService* service = |
+ ProfileSyncServiceFactory::GetForProfile(profile_); |
+ DCHECK(service); |
+ if (service->IsSyncEnabledAndLoggedIn()) |
Nicolas Zea
2015/02/27 19:25:00
Is this code only running in ChromeOS? if so, this
Ivan Podogov
2015/03/02 07:46:43
I'm not really sure of where this code may run, bu
|
+ service->AddObserver(this); |
+ else |
+ PostLoadAndRemoveObservers(); |
} |
} else { |
BrowserThread::PostTask( |
@@ -131,6 +140,15 @@ void ExternalPrefLoader::OnIsSyncingChanged() { |
PostLoadIfPrioritySyncReady(); |
} |
+void ExternalPrefLoader::OnStateChanged() { |
+ ProfileSyncService* service = |
+ ProfileSyncServiceFactory::GetForProfile(profile_); |
+ DCHECK(service); |
+ if (!service->IsSyncEnabledAndLoggedIn()) { |
+ PostLoadAndRemoveObservers(); |
+ } |
+} |
+ |
bool ExternalPrefLoader::PostLoadIfPrioritySyncReady() { |
DCHECK(options_ & DELAY_LOAD_UNTIL_PRIORITY_SYNC); |
DCHECK(profile_); |
@@ -138,16 +156,28 @@ bool ExternalPrefLoader::PostLoadIfPrioritySyncReady() { |
PrefServiceSyncable* prefs = PrefServiceSyncable::FromProfile(profile_); |
DCHECK(prefs); |
if (prefs->IsPrioritySyncing()) { |
- BrowserThread::PostTask( |
- BrowserThread::FILE, FROM_HERE, |
- base::Bind(&ExternalPrefLoader::LoadOnFileThread, this)); |
- syncable_pref_observer_.Remove(prefs); |
+ PostLoadAndRemoveObservers(); |
return true; |
} |
return false; |
} |
+void ExternalPrefLoader::PostLoadAndRemoveObservers() { |
+ PrefServiceSyncable* prefs = PrefServiceSyncable::FromProfile(profile_); |
+ DCHECK(prefs); |
+ syncable_pref_observer_.Remove(prefs); |
+ |
+ ProfileSyncService* service = |
+ ProfileSyncServiceFactory::GetForProfile(profile_); |
+ DCHECK(service); |
+ service->RemoveObserver(this); |
+ |
+ BrowserThread::PostTask( |
+ BrowserThread::FILE, FROM_HERE, |
+ base::Bind(&ExternalPrefLoader::LoadOnFileThread, this)); |
+} |
+ |
void ExternalPrefLoader::LoadOnFileThread() { |
CHECK(BrowserThread::CurrentlyOn(BrowserThread::FILE)); |