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

Side by Side 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, 10 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 unified diff | Download patch | Annotate | Revision Log
OLDNEW
1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
2 // Use of this source code is governed by a BSD-style license that can be 2 // Use of this source code is governed by a BSD-style license that can be
3 // found in the LICENSE file. 3 // found in the LICENSE file.
4 4
5 #include "chrome/browser/ui/webui/ntp/new_tab_page_sync_handler.h" 5 #include "chrome/browser/ui/webui/ntp/new_tab_page_sync_handler.h"
6 6
7 #include <vector> 7 #include <vector>
8 8
9 #include "base/bind.h" 9 #include "base/bind.h"
10 #include "base/bind_helpers.h" 10 #include "base/bind_helpers.h"
(...skipping 50 matching lines...) Expand 10 before | Expand all | Expand 10 after
61 case sync_ui_util::SYNCED: 61 case sync_ui_util::SYNCED:
62 default: 62 default:
63 return HIDE; 63 return HIDE;
64 } 64 }
65 } 65 }
66 66
67 void NewTabPageSyncHandler::RegisterMessages() { 67 void NewTabPageSyncHandler::RegisterMessages() {
68 sync_service_ = ProfileSyncServiceFactory::GetInstance()->GetForProfile( 68 sync_service_ = ProfileSyncServiceFactory::GetInstance()->GetForProfile(
69 Profile::FromWebUI(web_ui())); 69 Profile::FromWebUI(web_ui()));
70 DCHECK(sync_service_); // This shouldn't get called by an incognito NTP. 70 DCHECK(sync_service_); // This shouldn't get called by an incognito NTP.
71 DCHECK(!sync_service_->IsManaged()); // And neither if sync is managed.
72 sync_service_->AddObserver(this); 71 sync_service_->AddObserver(this);
73 72
74 web_ui()->RegisterMessageCallback("GetSyncMessage", 73 web_ui()->RegisterMessageCallback("GetSyncMessage",
75 base::Bind(&NewTabPageSyncHandler::HandleGetSyncMessage, 74 base::Bind(&NewTabPageSyncHandler::HandleGetSyncMessage,
76 base::Unretained(this))); 75 base::Unretained(this)));
77 web_ui()->RegisterMessageCallback("SyncLinkClicked", 76 web_ui()->RegisterMessageCallback("SyncLinkClicked",
78 base::Bind(&NewTabPageSyncHandler::HandleSyncLinkClicked, 77 base::Bind(&NewTabPageSyncHandler::HandleSyncLinkClicked,
79 base::Unretained(this))); 78 base::Unretained(this)));
80 } 79 }
81 80
(...skipping 42 matching lines...) Expand 10 before | Expand all | Expand 10 after
124 123
125 void NewTabPageSyncHandler::HandleSyncLinkClicked(const ListValue* args) { 124 void NewTabPageSyncHandler::HandleSyncLinkClicked(const ListValue* args) {
126 DCHECK(!waiting_for_initial_page_load_); 125 DCHECK(!waiting_for_initial_page_load_);
127 DCHECK(sync_service_); 126 DCHECK(sync_service_);
128 if (!sync_service_->IsSyncEnabled()) 127 if (!sync_service_->IsSyncEnabled())
129 return; 128 return;
130 Browser* browser = 129 Browser* browser =
131 chrome::FindBrowserWithWebContents(web_ui()->GetWebContents()); 130 chrome::FindBrowserWithWebContents(web_ui()->GetWebContents());
132 if (!browser || browser->IsAttemptingToCloseBrowser()) 131 if (!browser || browser->IsAttemptingToCloseBrowser())
133 return; 132 return;
134 chrome::ShowSyncSetup(browser, SyncPromoUI::SOURCE_NTP_LINK); 133 chrome::ShowBrowserSignin(browser, SyncPromoUI::SOURCE_NTP_LINK);
135 134
136 if (sync_service_->HasSyncSetupCompleted()) { 135 if (sync_service_->HasSyncSetupCompleted()) {
137 string16 user = UTF8ToUTF16(SigninManagerFactory::GetForProfile( 136 string16 user = UTF8ToUTF16(SigninManagerFactory::GetForProfile(
138 Profile::FromWebUI(web_ui()))->GetAuthenticatedUsername()); 137 Profile::FromWebUI(web_ui()))->GetAuthenticatedUsername());
139 DictionaryValue value; 138 DictionaryValue value;
140 value.SetString("syncEnabledMessage", 139 value.SetString("syncEnabledMessage",
141 l10n_util::GetStringFUTF16(IDS_SYNC_NTP_SYNCED_TO, 140 l10n_util::GetStringFUTF16(IDS_SYNC_NTP_SYNCED_TO,
142 user)); 141 user));
143 web_ui()->CallJavascriptFunction("ntp.syncAlreadyEnabled", value); 142 web_ui()->CallJavascriptFunction("ntp.syncAlreadyEnabled", value);
144 } else { 143 } else {
(...skipping 43 matching lines...) Expand 10 before | Expand all | Expand 10 after
188 if (linkurl.empty()) { 187 if (linkurl.empty()) {
189 value.SetBoolean("linkurlisset", false); 188 value.SetBoolean("linkurlisset", false);
190 } else { 189 } else {
191 value.SetBoolean("linkurlisset", true); 190 value.SetBoolean("linkurlisset", true);
192 value.SetString("linkurl", linkurl); 191 value.SetString("linkurl", linkurl);
193 } 192 }
194 } 193 }
195 } 194 }
196 web_ui()->CallJavascriptFunction("ntp.syncMessageChanged", value); 195 web_ui()->CallJavascriptFunction("ntp.syncMessageChanged", value);
197 } 196 }
OLDNEW
« 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