chrome/browser/extensions/api/storage/sync_or_local_value_store_cache.cc - Issue 15404005: sync: deferred initialization support for app/extension settings

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

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: with util fix 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

« chrome/browser/extensions/api/storage/settings_backend.cc ('K') | « chrome/browser/extensions/api/storage/settings_backend.cc ('k') | chrome/browser/sync/glue/sync_start_util.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | 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..4c639b7ce084b0df750af5c2e928b1ece986e62c 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, quota, observers));

+ app_backend_->InjectStartSyncFlare(

+ sync_start_util::GetFlareForSyncableService(profile_path));

not at google - send to devlin 2013/05/20 18:00:04 it looks like the flare can be a constructor param

tim (not reviewing) 2013/05/20 18:21:15 Good point, done.

+ extension_backend_.reset(new SettingsBackend(

+ factory, extension_path, syncer::EXTENSION_SETTINGS, quota, observers));

+ extension_backend_->InjectStartSyncFlare(

+ sync_start_util::GetFlareForSyncableService(profile_path));

}

} // namespace extensions