chrome/browser/sync/sync_ui_util.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/sync/sync_ui_util.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: chrome/browser/sync/sync_ui_util.cc

diff --git a/chrome/browser/sync/sync_ui_util.cc b/chrome/browser/sync/sync_ui_util.cc

index 10f359bd74d19cfad92a2d317524a2b9b290d432..fd601d70387ae2af7f1678d79a8815273832e64c 100644

--- a/chrome/browser/sync/sync_ui_util.cc

+++ b/chrome/browser/sync/sync_ui_util.cc

@@ -32,12 +32,12 @@

#include "components/prefs/pref_service.h"

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

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

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

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

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

+#include "components/sync/sessions/sync_session_snapshot.h"

#include "google_apis/gaia/google_service_auth_error.h"

#include "grit/components_strings.h"

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

-#include "sync/internal_api/public/sessions/sync_session_snapshot.h"

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

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

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

#if defined(OS_CHROMEOS)

« build/all.gyp ('K') | « chrome/browser/sync/sessions/sessions_sync_manager_unittest.cc ('k') | chrome/browser/sync/test/DEPS » ('j') | no next file with comments »