chrome/browser/search_engines/template_url_service.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/search_engines/template_url_service.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/prefs/pref_model_associator.cc ('k') | chrome/browser/search_engines/template_url_service_sync_unittest.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: chrome/browser/search_engines/template_url_service.cc

diff --git a/chrome/browser/search_engines/template_url_service.cc b/chrome/browser/search_engines/template_url_service.cc

index b93f4dd17296fe8491e72706ebb08a0ae0aab469..80e6ba82e7433ea72df8dcf7d55c2a521e96dcff 100644

--- a/chrome/browser/search_engines/template_url_service.cc

+++ b/chrome/browser/search_engines/template_url_service.cc

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

#include "chrome/browser/search_engines/util.h"

#include "chrome/browser/sync/api/sync_change.h"

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

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

#include "chrome/common/chrome_notification_types.h"

#include "chrome/common/chrome_switches.h"

#include "chrome/common/env_vars.h"

@@ -965,8 +966,8 @@ void TemplateURLService::ProcessTemplateURLChange(

SyncData TemplateURLService::CreateSyncDataFromTemplateURL(

const TemplateURL& turl) {

sync_pb::EntitySpecifics specifics;

- sync_pb::SearchEngineSpecifics* se_specifics = specifics.MutableExtension(

- sync_pb::search_engine);

+ sync_pb::SearchEngineSpecifics* se_specifics =

+ specifics.mutable_search_engine();

se_specifics->set_short_name(UTF16ToUTF8(turl.short_name()));

se_specifics->set_keyword(UTF16ToUTF8(turl.keyword()));

se_specifics->set_favicon_url(turl.GetFaviconURL().spec());

@@ -1003,8 +1004,7 @@ SyncDataMap TemplateURLService::CreateGUIDToSyncDataMap(

SyncDataMap data_map;

SyncDataList::const_iterator iter;

for (iter = sync_data.begin(); iter != sync_data.end(); ++iter) {

- data_map[iter->GetSpecifics().GetExtension(

- sync_pb::search_engine).sync_guid()] = *iter;

+ data_map[iter->GetSpecifics().search_engine().sync_guid()] = *iter;

}

return data_map;

}

@@ -1889,7 +1889,7 @@ void TemplateURLService::UpdateTemplateURLWithSyncData(

TemplateURL* dst,

const SyncData& sync_data) {

sync_pb::SearchEngineSpecifics specifics =

- sync_data.GetSpecifics().GetExtension(sync_pb::search_engine);

+ sync_data.GetSpecifics().search_engine();

dst->set_short_name(UTF8ToUTF16(specifics.short_name()));

dst->set_keyword(UTF8ToUTF16(specifics.keyword()));

dst->SetFaviconURL(GURL(specifics.favicon_url()));