chrome/browser/extensions/api/storage/syncable_settings_storage.h - Issue 16915006: Convert most of extensions and some other random stuff to using the base namespace for Values.

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

Issue 16915006: Convert most of extensions and some other random stuff to using the base namespace for Values. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src

Patch Set: Created 7 years, 6 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/proxy/proxy_api_helpers_unittest.cc ('K') | « chrome/browser/extensions/api/storage/storage_api.cc ('k') | chrome/browser/extensions/api/storage/syncable_settings_storage.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: chrome/browser/extensions/api/storage/syncable_settings_storage.h

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

index ec57f83ced6e534c01dd38c533f61ffa203d788d..d971ef005ee35d536451f4261d7f63ae93e3ee69 100644

--- a/chrome/browser/extensions/api/storage/syncable_settings_storage.h

+++ b/chrome/browser/extensions/api/storage/syncable_settings_storage.h

@@ -43,7 +43,7 @@ class SyncableSettingsStorage : public ValueStore {

const std::string& key,

const Value& value) OVERRIDE;

virtual WriteResult Set(

- WriteOptions options, const DictionaryValue& values) OVERRIDE;

+ WriteOptions options, const base::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;

@@ -54,7 +54,7 @@ class SyncableSettingsStorage : public ValueStore {

// Must only be called if sync isn't already active.

syncer::SyncError StartSyncing(

- const DictionaryValue& sync_state,

+ const base::DictionaryValue& sync_state,

scoped_ptr<SettingsSyncProcessor> sync_processor);

// May be called at any time (idempotent).

@@ -69,11 +69,12 @@ class SyncableSettingsStorage : public ValueStore {

// Sends all local settings to sync (synced settings assumed to be empty).

syncer::SyncError SendLocalSettingsToSync(

- const DictionaryValue& settings);

+ const base::DictionaryValue& settings);

// Overwrites local state with sync state.

syncer::SyncError OverwriteLocalSettingsWithSync(

- const DictionaryValue& sync_state, const DictionaryValue& settings);

+ const base::DictionaryValue& sync_state,

+ const base::DictionaryValue& settings);

// Called when an Add/Update/Remove comes from sync. Ownership of Value*s

// are taken.