chrome/browser/search_engines/template_url_service.cc - Issue 9668028: [Sync] Create new top-level sync/ directory

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 9668028: [Sync] Create new top-level sync/ directory (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src

Patch Set: sync to head Created 8 years, 9 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:

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 80e6ba82e7433ea72df8dcf7d55c2a521e96dcff..3a84654749dca253bcc63fb91792281f12168ce6 100644

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

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

@@ -23,8 +23,8 @@

#include "chrome/browser/prefs/pref_set_observer.h"

#include "chrome/browser/profiles/profile.h"

#include "chrome/browser/protector/base_setting_change.h"

-#include "chrome/browser/protector/protector_service_factory.h"

#include "chrome/browser/protector/protector_service.h"

+#include "chrome/browser/protector/protector_service_factory.h"

#include "chrome/browser/rlz/rlz.h"

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

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

@@ -33,8 +33,6 @@

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

#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"

@@ -44,6 +42,8 @@

#include "chrome/common/url_constants.h"

#include "content/public/browser/notification_service.h"

#include "net/base/net_util.h"

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

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

#include "ui/base/l10n/l10n_util.h"

typedef SearchHostToURLsMap::TemplateURLSet TemplateURLSet;