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

Unified Diff: chrome/browser/extensions/settings/settings_frontend.cc

Issue 9414020: [Sync] Switch Extension Settings DTC to use ProfilesyncComponentsFactory (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: DCHECK Created 8 years, 10 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
Index: chrome/browser/extensions/settings/settings_frontend.cc
diff --git a/chrome/browser/extensions/settings/settings_frontend.cc b/chrome/browser/extensions/settings/settings_frontend.cc
index 6c5fbedf04e1f0785175002333943ab5e6c24e0c..a29fbc57eedf2995058e6397c6d8ad898d576815 100644
--- a/chrome/browser/extensions/settings/settings_frontend.cc
+++ b/chrome/browser/extensions/settings/settings_frontend.cc
@@ -161,6 +161,11 @@ class SettingsFrontend::BackendWrapper
callback));
}
+ SettingsBackend* GetBackend() const {
+ DCHECK(BrowserThread::CurrentlyOn(BrowserThread::FILE));
+ return backend_;
+ }
+
private:
friend class base::RefCountedThreadSafe<BackendWrapper>;
@@ -273,23 +278,21 @@ SettingsFrontend::~SettingsFrontend() {
observers_->RemoveObserver(profile_observer_.get());
}
-void SettingsFrontend::RunWithSyncableService(
- syncable::ModelType model_type, const SyncableServiceCallback& callback) {
- DCHECK(BrowserThread::CurrentlyOn(BrowserThread::UI));
- scoped_refptr<BackendWrapper> backend;
- switch (model_type) {
+SyncableService* SettingsFrontend::GetBackendForSync(
+ syncable::ModelType type) const {
+ DCHECK(BrowserThread::CurrentlyOn(BrowserThread::FILE));
+ std::map<settings_namespace::Namespace, BackendWrappers>::const_iterator
+ sync_backends = backends_.find(settings_namespace::SYNC);
+ DCHECK(sync_backends != backends_.end());
+ switch (type) {
case syncable::APP_SETTINGS:
- backend = backends_[settings_namespace::SYNC].app;
- break;
-
+ return sync_backends->second.app->GetBackend();
case syncable::EXTENSION_SETTINGS:
- backend = backends_[settings_namespace::SYNC].extension;
- break;
-
+ return sync_backends->second.extension->GetBackend();
default:
NOTREACHED();
+ return NULL;
}
- backend->RunWithBackend(base::Bind(&CallbackWithSyncableService, callback));
}
void SettingsFrontend::RunWithStorage(
« no previous file with comments | « chrome/browser/extensions/settings/settings_frontend.h ('k') | chrome/browser/extensions/settings/settings_sync_unittest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698