chrome/browser/ui/webui/ntp/new_tab_page_sync_handler.cc - Issue 7093004: Sync: Refactor the ProfileSyncService and sync setup flow to remove use of WebUI from PSS.

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

Issue 7093004: Sync: Refactor the ProfileSyncService and sync setup flow to remove use of WebUI from PSS. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src

Patch Set: Win fix. Created 9 years, 6 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

« chrome/browser/sync/sync_setup_wizard.h ('K') | « chrome/browser/ui/views/bookmarks/bookmark_bar_view.cc ('k') | chrome/browser/ui/webui/options/personal_options_handler.h » ('j') | chrome/browser/ui/webui/options/sync_setup_handler.cc » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

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

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

index 7b9320a0a8d6a644e46487fd964540d7b1f3807f..217af7625f0eab12b7937a17b23586181765c96e 100644

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

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

@@ -156,7 +156,7 @@ void NewTabPageSyncHandler::HandleSyncLinkClicked(const ListValue* args) {

if (!sync_service_->IsSyncEnabled())

return;

if (sync_service_->HasSyncSetupCompleted()) {

- sync_service_->ShowErrorUI(NULL);

+ sync_service_->ShowErrorUI();

DictionaryValue value;

value.SetString("syncEnabledMessage",

l10n_util::GetStringFUTF16(IDS_SYNC_NTP_SYNCED_TO,

@@ -165,7 +165,7 @@ void NewTabPageSyncHandler::HandleSyncLinkClicked(const ListValue* args) {

} else {

// User clicked the 'Start now' link to begin syncing.

ProfileSyncService::SyncEvent(ProfileSyncService::START_FROM_NTP);

- sync_service_->ShowLoginDialog(NULL);

+ sync_service_->ShowLoginDialog();

}