Chromium Code Reviews| 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 92495139d3158137eac50253965e9f618a28b009..39c1db89f0e061f9f3ee28f5cb961c706eb2b5aa 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 |
| @@ -13,7 +13,9 @@ |
| #include "base/utf_string_conversions.h" |
| #include "base/values.h" |
| #include "chrome/browser/net/chrome_url_request_context.h" |
| +#include "chrome/browser/prefs/pref_service.h" |
| #include "chrome/browser/profiles/profile.h" |
| +#include "chrome/common/pref_names.h" |
| #include "content/browser/renderer_host/render_view_host.h" |
| #include "grit/generated_resources.h" |
| #include "net/base/cookie_monster.h" |
| @@ -115,10 +117,12 @@ void NewTabPageSyncHandler::HandleSyncLinkClicked(const ListValue* args) { |
| return; |
| if (sync_service_->HasSyncSetupCompleted()) { |
| sync_service_->ShowErrorUI(); |
| + string16 user = UTF8ToUTF16(sync_service_->profile()->GetPrefs()->GetString( |
| + prefs::kGoogleServicesUsername)); |
|
Andrew T Wilson (Slow)
2011/12/01 23:08:07
Do we need to check sync_initialized() here too? O
tim (not reviewing)
2011/12/02 02:19:59
I don't know of a case where we leave sync setup c
|
| DictionaryValue value; |
| value.SetString("syncEnabledMessage", |
| l10n_util::GetStringFUTF16(IDS_SYNC_NTP_SYNCED_TO, |
| - sync_service_->GetAuthenticatedUsername())); |
| + user)); |
| web_ui_->CallJavascriptFunction("syncAlreadyEnabled", value); |
| } else { |
| // User clicked the 'Start now' link to begin syncing. |