components/search_engines/template_url_service.cc - Issue 2148293004: [Sync] //components/sync external changes [DO NOT SUBMIT]

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: components/search_engines/template_url_service.cc

Issue 2148293004: [Sync] //components/sync external changes [DO NOT SUBMIT] (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@sc-1

Patch Set: Rebase. Created 4 years, 5 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

Index: components/search_engines/template_url_service.cc

diff --git a/components/search_engines/template_url_service.cc b/components/search_engines/template_url_service.cc

index a3e0663a34a0d62202f5c8254478e969e5ed5551..d0452a38e48f915f307635c9cac7e4b44f62d7ca 100644

--- a/components/search_engines/template_url_service.cc

+++ b/components/search_engines/template_url_service.cc

@@ -33,13 +33,13 @@

#include "components/search_engines/template_url_service_client.h"

#include "components/search_engines/template_url_service_observer.h"

#include "components/search_engines/util.h"

+#include "components/sync/api/sync_change.h"

+#include "components/sync/api/sync_error_factory.h"

+#include "components/sync/protocol/search_engine_specifics.pb.h"

+#include "components/sync/protocol/sync.pb.h"

#include "components/url_formatter/url_fixer.h"

#include "components/url_formatter/url_formatter.h"

#include "net/base/registry_controlled_domains/registry_controlled_domain.h"

-#include "sync/api/sync_change.h"

-#include "sync/api/sync_error_factory.h"

-#include "sync/protocol/search_engine_specifics.pb.h"

-#include "sync/protocol/sync.pb.h"

#include "url/gurl.h"

typedef SearchHostToURLsMap::TemplateURLSet TemplateURLSet;

« build/all.gyp ('K') | « components/search_engines/template_url_service.h ('k') | components/sessions.gypi » ('j') | no next file with comments »