chrome/browser/profiles/profile_manager.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: chrome/browser/profiles/profile_manager.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

« build/all.gyp ('K') | « chrome/browser/prefs/synced_pref_change_registrar_browsertest.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/profiles/profile_manager.cc

diff --git a/chrome/browser/profiles/profile_manager.cc b/chrome/browser/profiles/profile_manager.cc

index 6451dd64211c2e6b0a0a6f153b8409e04b6f7c16..09c2b0f137c78f9c521cdc59f9352b75c78b0936 100644

--- a/chrome/browser/profiles/profile_manager.cc

+++ b/chrome/browser/profiles/profile_manager.cc

@@ -80,6 +80,7 @@

#include "components/signin/core/browser/signin_manager.h"

#include "components/signin/core/common/profile_management_switches.h"

#include "components/signin/core/common/signin_pref_names.h"

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

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

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

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

@@ -88,7 +89,6 @@

#include "net/url_request/url_request_context.h"

#include "net/url_request/url_request_context_getter.h"

#include "net/url_request/url_request_job.h"

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

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

#if defined(ENABLE_EXTENSIONS)