chrome/browser/prefs/chrome_pref_service_factory.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/prefs/chrome_pref_service_factory.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/prefs/chrome_pref_service_factory.cc

diff --git a/chrome/browser/prefs/chrome_pref_service_factory.cc b/chrome/browser/prefs/chrome_pref_service_factory.cc

index a93f046d7804d0824f0fe006963ff66fb67d4673..66d0f59dce4093dc6ba35354e4d79267768bc18a 100644

--- a/chrome/browser/prefs/chrome_pref_service_factory.cc

+++ b/chrome/browser/prefs/chrome_pref_service_factory.cc

@@ -48,6 +48,7 @@

#include "components/search_engines/default_search_pref_migration.h"

#include "components/search_engines/search_engines_pref_names.h"

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

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

#include "components/sync_driver/pref_names.h"

#include "components/syncable_prefs/pref_model_associator.h"

#include "components/syncable_prefs/pref_service_syncable.h"

@@ -56,7 +57,6 @@

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

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

#include "grit/browser_resources.h"

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

#include "ui/base/resource/resource_bundle.h"

#if defined(ENABLE_EXTENSIONS)

« build/all.gyp ('K') | « chrome/browser/prefs/DEPS ('k') | chrome/browser/prefs/synced_pref_change_registrar_browsertest.cc » ('j') | no next file with comments »