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

Unified Diff: chrome/browser/extensions/api/storage/sync_or_local_value_store_cache.cc

Issue 15404005: sync: deferred initialization support for app/extension settings (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: rebase Created 7 years, 7 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/extensions/api/storage/settings_backend.cc ('k') | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/browser/extensions/api/storage/sync_or_local_value_store_cache.cc
diff --git a/chrome/browser/extensions/api/storage/sync_or_local_value_store_cache.cc b/chrome/browser/extensions/api/storage/sync_or_local_value_store_cache.cc
index f6d5d1b5ca1cb1d47b3ec234784add4f2a477409..607beb2d52e2b3f880235870f8bacb25a87a32b4 100644
--- a/chrome/browser/extensions/api/storage/sync_or_local_value_store_cache.cc
+++ b/chrome/browser/extensions/api/storage/sync_or_local_value_store_cache.cc
@@ -13,6 +13,7 @@
#include "chrome/browser/extensions/api/storage/settings_storage_quota_enforcer.h"
#include "chrome/browser/extensions/api/storage/weak_unlimited_settings_storage.h"
#include "chrome/browser/extensions/extension_service.h"
+#include "chrome/browser/sync/glue/sync_start_util.h"
#include "chrome/common/extensions/extension.h"
#include "chrome/common/extensions/permissions/api_permission.h"
#include "content/public/browser/browser_thread.h"
@@ -107,9 +108,14 @@ void SyncOrLocalValueStoreCache::InitOnFileThread(
const base::FilePath extension_path = profile_path.AppendASCII(
local ? ExtensionService::kLocalExtensionSettingsDirectoryName
: ExtensionService::kSyncExtensionSettingsDirectoryName);
- app_backend_.reset(new SettingsBackend(factory, app_path, quota, observers));
- extension_backend_.reset(
- new SettingsBackend(factory, extension_path, quota, observers));
+ app_backend_.reset(new SettingsBackend(
+ factory, app_path, syncer::APP_SETTINGS,
+ sync_start_util::GetFlareForSyncableService(profile_path),
+ quota, observers));
+ extension_backend_.reset(new SettingsBackend(
+ factory, extension_path, syncer::EXTENSION_SETTINGS,
+ sync_start_util::GetFlareForSyncableService(profile_path),
+ quota, observers));
}
} // namespace extensions
« no previous file with comments | « chrome/browser/extensions/api/storage/settings_backend.cc ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698