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: nick's comment 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') | chrome/browser/sync/protocol/proto_value_conversions.cc » ('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 68a69ccf1212c555fc06ab0087ceb57ba0c25bb8..5fcc9a69d1a7ae6c67b6f0f821d584c96b5dbd3a 100644

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

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

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

#include "base/json/json_writer.h"

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

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

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

namespace extensions {

@@ -46,14 +47,13 @@ SyncData CreateData(

const Value& value,

syncable::ModelType type) {

sync_pb::EntitySpecifics specifics;

switch (type) {

case syncable::EXTENSION_SETTINGS:

PopulateExtensionSettingSpecifics(

extension_id,

key,

value,

- specifics.MutableExtension(sync_pb::extension_setting));

+ specifics.mutable_extension_setting());

break;

case syncable::APP_SETTINGS:

@@ -61,7 +61,7 @@ SyncData CreateData(

extension_id,

key,

value,

- specifics.MutableExtension(sync_pb::app_setting));

+ specifics.mutable_app_setting());

break;

default: