chrome/browser/extensions/settings/syncable_settings_storage.h - Issue 8587025: Extension settings API: force through changes that come from sync (ignoring

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/settings/syncable_settings_storage.h

Issue 8587025: Extension settings API: force through changes that come from sync (ignoring (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src

Patch Set: sync Created 9 years, 1 month 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/settings/settings_sync_unittest.cc ('k') | chrome/browser/extensions/settings/syncable_settings_storage.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: chrome/browser/extensions/settings/syncable_settings_storage.h

diff --git a/chrome/browser/extensions/settings/syncable_settings_storage.h b/chrome/browser/extensions/settings/syncable_settings_storage.h

index 56bb88a3f609dbd2e5c951b43d52a7881183fc38..d650229abaebc07e8d8da9412c13d206173b3bbe 100644

--- a/chrome/browser/extensions/settings/syncable_settings_storage.h

+++ b/chrome/browser/extensions/settings/syncable_settings_storage.h

@@ -34,8 +34,12 @@ class SyncableSettingsStorage : public SettingsStorage {

virtual ReadResult Get(const std::string& key) OVERRIDE;

virtual ReadResult Get(const std::vector<std::string>& keys) OVERRIDE;

virtual ReadResult Get() OVERRIDE;

- virtual WriteResult Set(const std::string& key, const Value& value) OVERRIDE;

- virtual WriteResult Set(const DictionaryValue& settings) OVERRIDE;

+ virtual WriteResult Set(

+ WriteOptions options,

+ const std::string& key,

+ const Value& value) OVERRIDE;

+ virtual WriteResult Set(

+ WriteOptions options, const DictionaryValue& values) OVERRIDE;

virtual WriteResult Remove(const std::string& key) OVERRIDE;

virtual WriteResult Remove(const std::vector<std::string>& keys) OVERRIDE;

virtual WriteResult Clear() OVERRIDE;