Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(218)

Unified Diff: chrome/browser/ui/webui/ntp/new_tab_page_sync_handler.cc

Issue 12077030: Allow signin to continue even if sync is disabled by policy. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Fix windows sync integration test failure Created 7 years, 11 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/ui/toolbar/wrench_menu_model.cc ('k') | chrome/browser/ui/webui/ntp/new_tab_ui.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments 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 6022bb9e87971b2c5ea221090095f008d727dfaf..1639456ab7727a0d564b74bfd1efda5697a3aec4 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
@@ -68,7 +68,6 @@ void NewTabPageSyncHandler::RegisterMessages() {
sync_service_ = ProfileSyncServiceFactory::GetInstance()->GetForProfile(
Profile::FromWebUI(web_ui()));
DCHECK(sync_service_); // This shouldn't get called by an incognito NTP.
- DCHECK(!sync_service_->IsManaged()); // And neither if sync is managed.
sync_service_->AddObserver(this);
web_ui()->RegisterMessageCallback("GetSyncMessage",
@@ -131,7 +130,7 @@ void NewTabPageSyncHandler::HandleSyncLinkClicked(const ListValue* args) {
chrome::FindBrowserWithWebContents(web_ui()->GetWebContents());
if (!browser || browser->IsAttemptingToCloseBrowser())
return;
- chrome::ShowSyncSetup(browser, SyncPromoUI::SOURCE_NTP_LINK);
+ chrome::ShowBrowserSignin(browser, SyncPromoUI::SOURCE_NTP_LINK);
if (sync_service_->HasSyncSetupCompleted()) {
string16 user = UTF8ToUTF16(SigninManagerFactory::GetForProfile(
« no previous file with comments | « chrome/browser/ui/toolbar/wrench_menu_model.cc ('k') | chrome/browser/ui/webui/ntp/new_tab_ui.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698