chrome/browser/extensions/settings/setting_sync_data.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/setting_sync_data.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: fred's review 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/extension_sync_data_unittest.cc ('k') | chrome/browser/extensions/settings/settings_sync_util.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

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

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

index f53796973a804f0f4c8794fce83d0ba6115f62e7..fa71ff8180de336fc0a28fe58bdb0e77cef20ac2 100644

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

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

@@ -28,16 +28,16 @@ void SettingSyncData::Init(

DCHECK(!internal_.get());

sync_pb::EntitySpecifics specifics = sync_data.GetSpecifics();

// The data must only be either extension or app specfics.

- DCHECK_NE(specifics.HasExtension(sync_pb::extension_setting),

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

- if (specifics.HasExtension(sync_pb::extension_setting)) {

+ DCHECK_NE(specifics.has_extension_setting(),

+ specifics.has_app_setting());

+ if (specifics.has_extension_setting()) {

InitFromExtensionSettingSpecifics(

change_type,

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

- } else if (specifics.HasExtension(sync_pb::app_setting)) {

+ specifics.extension_setting());

+ } else if (specifics.has_app_setting()) {

InitFromExtensionSettingSpecifics(

change_type,

- specifics.GetExtension(sync_pb::app_setting).extension_setting());

+ specifics.app_setting().extension_setting());

}