chrome/browser/ui/webui/ntp/foreign_session_handler.cc - Issue 16105012: Unrevert "[Sync] Split GetPreferredTypes into GetActiveType...""

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/ui/webui/ntp/foreign_session_handler.cc

Issue 16105012: Unrevert "[Sync] Split GetPreferredTypes into GetActiveType..."" (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src

Patch Set: Adjust mock Created 7 years, 7 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:

Index: chrome/browser/ui/webui/ntp/foreign_session_handler.cc

diff --git a/chrome/browser/ui/webui/ntp/foreign_session_handler.cc b/chrome/browser/ui/webui/ntp/foreign_session_handler.cc

index 61fa871a1a94006f2ccf96ce2c501cf390551a8c..e8bb973a404131dceba7da357db750ffc78fc668 100644

--- a/chrome/browser/ui/webui/ntp/foreign_session_handler.cc

+++ b/chrome/browser/ui/webui/ntp/foreign_session_handler.cc

@@ -218,7 +218,7 @@ bool ForeignSessionHandler::IsTabSyncEnabled() {

Profile* profile = Profile::FromWebUI(web_ui());

ProfileSyncService* service =

ProfileSyncServiceFactory::GetInstance()->GetForProfile(profile);

- return service && service->GetPreferredDataTypes().Has(syncer::PROXY_TABS);

+ return service && service->GetActiveDataTypes().Has(syncer::PROXY_TABS);

}

string16 ForeignSessionHandler::FormatSessionTime(const base::Time& time) {