chrome/browser/extensions/settings/settings_sync_util.cc - Issue 9460047: sync: remove use of protobuf extensions in protocol to reduce static init overhead.

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/settings_sync_util.cc

Issue 9460047: sync: remove use of protobuf extensions in protocol to reduce static init overhead. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src

Patch Set: fix nigori access in testserver 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

« no previous file with comments | « chrome/browser/extensions/settings/setting_sync_data.cc ('k') | chrome/browser/prefs/pref_model_associator.cc » ('j') | net/tools/testserver/chromiumsync.py » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: chrome/browser/extensions/settings/settings_sync_util.cc

diff --git a/chrome/browser/extensions/settings/settings_sync_util.cc b/chrome/browser/extensions/settings/settings_sync_util.cc

index 07ca7a69463aa151419f57e37a2d7054d132fec3..1abf0d7ef596f684ca785729d0aea94c45a05ba8 100644

--- a/chrome/browser/extensions/settings/settings_sync_util.cc

+++ b/chrome/browser/extensions/settings/settings_sync_util.cc

@@ -7,6 +7,7 @@

#include "base/values.h"

#include "base/json/json_writer.h"

#include "chrome/browser/sync/protocol/extension_setting_specifics.pb.h"

+#include "chrome/browser/sync/protocol/sync.pb.h"

namespace extensions {

@@ -18,7 +19,7 @@ SyncData CreateData(

const Value& value) {

sync_pb::EntitySpecifics specifics;

sync_pb::ExtensionSettingSpecifics* setting_specifics =

- specifics.MutableExtension(sync_pb::extension_setting);

+ specifics.mutable_extension_setting();

setting_specifics->set_extension_id(extension_id);

setting_specifics->set_key(key);

std::string value_as_json;