chrome/browser/sync/profile_sync_service_android.cc - Issue 1334173006: Move sync_internals resources and constants to //components.

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/profile_sync_service_android.cc

Issue 1334173006: Move sync_internals resources and constants to //components. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@gcmInternals

Patch Set: Rebase Created 5 years, 3 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

« no previous file with comments | « chrome/browser/resources/sync_internals_resources.grd ('k') | chrome/browser/sync/test/integration/profile_sync_service_harness.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: chrome/browser/sync/profile_sync_service_android.cc

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

index ec5930b3593a30644c73b8adb2bc530392cf948d..a75318ac69bcc0a338eb6fcb32562dc4c691de37 100644

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

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

@@ -389,9 +389,8 @@ ScopedJavaLocalRef<jstring> ProfileSyncServiceAndroid::GetAboutInfoForTest(

DCHECK_CURRENTLY_ON(BrowserThread::UI);

scoped_ptr<base::DictionaryValue> about_info =

- sync_ui_util::ConstructAboutInformation(sync_service_,

- sync_service_->signin(),

- chrome::GetChannel());

+ sync_driver::sync_ui_util::ConstructAboutInformation(

+ sync_service_, sync_service_->signin(), chrome::GetChannel());

std::string about_info_json;

base::JSONWriter::Write(*about_info, &about_info_json);