components/history/core/browser/typed_url_syncable_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/history/core/browser/typed_url_syncable_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

« build/all.gyp ('K') | « components/history/core/browser/typed_url_syncable_service.h ('k') | components/history/core/browser/typed_url_syncable_service_unittest.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: components/history/core/browser/typed_url_syncable_service.cc

diff --git a/components/history/core/browser/typed_url_syncable_service.cc b/components/history/core/browser/typed_url_syncable_service.cc

index b152df15538f73e9dc7b26a6d43dcf58fb42731f..b8aa8b416d7dd2a6ff5400f6bf5f6ec2e19aef5e 100644

--- a/components/history/core/browser/typed_url_syncable_service.cc

+++ b/components/history/core/browser/typed_url_syncable_service.cc

@@ -5,6 +5,7 @@

#include "components/history/core/browser/typed_url_syncable_service.h"

#include <stddef.h>

#include <utility>

#include "base/auto_reset.h"

@@ -12,9 +13,9 @@

#include "base/metrics/histogram_macros.h"

#include "base/strings/utf_string_conversions.h"

#include "components/history/core/browser/history_backend.h"

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

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

#include "net/base/url_util.h"

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

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

namespace history {