ios/chrome/browser/sync/sync_setup_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: ios/chrome/browser/sync/sync_setup_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: ios/chrome/browser/sync/sync_setup_service.cc

diff --git a/ios/chrome/browser/sync/sync_setup_service.cc b/ios/chrome/browser/sync/sync_setup_service.cc

index 4bf3b9793381e26edb9838abfa748190483b4ab1..51a2e7e7d4bfbb0c0bca20b87cb657f6b8e75213 100644

--- a/ios/chrome/browser/sync/sync_setup_service.cc

+++ b/ios/chrome/browser/sync/sync_setup_service.cc

@@ -9,14 +9,14 @@

#include "base/macros.h"

#include "base/metrics/histogram_macros.h"

#include "components/prefs/pref_service.h"

+#include "components/sync/base/stop_source.h"

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

#include "components/sync_driver/sync_prefs.h"

#include "components/sync_driver/sync_service.h"

#include "google_apis/gaia/google_service_auth_error.h"

#include "ios/chrome/browser/browser_state/chrome_browser_state.h"

#include "ios/chrome/browser/pref_names.h"

#include "net/base/network_change_notifier.h"

-#include "sync/internal_api/public/base/stop_source.h"

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

namespace {

// The set of user-selectable datatypes. This must be in the same order as

« build/all.gyp ('K') | « ios/chrome/browser/sync/sync_setup_service.h ('k') | ios/chrome/browser/ui/webui/history/browsing_history_handler.cc » ('j') | no next file with comments »