Replace direct access to kGoogleServicesUsername with calls to SigninManager.

chrome/browser/ui/webui/ntp/ntp_login_handler.cc

 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "chrome/browser/ui/webui/ntp/ntp_login_handler.h"
 
 #include <string>
 
 #include "base/bind.h"
 #include "base/bind_helpers.h"
@@ skipping 68 matching lines @@
 }  // namespace
 
 NTPLoginHandler::NTPLoginHandler() {
 }
 
 NTPLoginHandler::~NTPLoginHandler() {
 }
 
 void NTPLoginHandler::RegisterMessages() {
   PrefService* pref_service = Profile::FromWebUI(web_ui())->GetPrefs();
-  username_pref_.Init(prefs::kGoogleServicesUsername,
-                      pref_service,
-                      base::Bind(&NTPLoginHandler::UpdateLogin,
-                                 base::Unretained(this)));
   signin_allowed_pref_.Init(prefs::kSigninAllowed,
                             pref_service,
                             base::Bind(&NTPLoginHandler::UpdateLogin,
                                        base::Unretained(this)));
 
   registrar_.Add(this, chrome::NOTIFICATION_PROFILE_CACHED_INFO_CHANGED,
                  content::NotificationService::AllSources());
 
   web_ui()->RegisterMessageCallback("initializeSyncLogin",
       base::Bind(&NTPLoginHandler::HandleInitializeSyncLogin,
@@ skipping 15 matching lines @@
   DCHECK_EQ(chrome::NOTIFICATION_PROFILE_CACHED_INFO_CHANGED, type);
   UpdateLogin();
 }
 
 void NTPLoginHandler::HandleInitializeSyncLogin(const base::ListValue* args) {
   UpdateLogin();
 }
 
 void NTPLoginHandler::HandleShowSyncLoginUI(const base::ListValue* args) {
   Profile* profile = Profile::FromWebUI(web_ui());
-  std::string username = profile->GetPrefs()->GetString(
-      prefs::kGoogleServicesUsername);
+  std::string username =
+      SigninManagerFactory::GetForProfile(profile)->GetAuthenticatedUsername();
   content::WebContents* web_contents = web_ui()->GetWebContents();
   Browser* browser = chrome::FindBrowserWithWebContents(web_contents);
   if (!browser)
     return;
 
   if (username.empty()) {
     // The user isn't signed in, show the sign in promo.
     if (signin::ShouldShowPromo(profile)) {
       signin::Source source =
           (web_contents->GetURL().spec() == chrome::kChromeUIAppsURL) ?
@@ skipping 48 matching lines @@
 
 void NTPLoginHandler::HandleShowAdvancedLoginUI(const base::ListValue* args) {
   Browser* browser =
       chrome::FindBrowserWithWebContents(web_ui()->GetWebContents());
   if (browser)
     chrome::ShowBrowserSignin(browser, signin::SOURCE_NTP_LINK);
 }
 
 void NTPLoginHandler::UpdateLogin() {
   Profile* profile = Profile::FromWebUI(web_ui());
-  std::string username = profile->GetPrefs()->GetString(
-      prefs::kGoogleServicesUsername);
+  std::string username =
+      SigninManagerFactory::GetForProfile(profile)->GetAuthenticatedUsername();
 
   base::string16 header, sub_header;
   std::string icon_url;
   if (!username.empty()) {
     ProfileInfoCache& cache =
         g_browser_process->profile_manager()->GetProfileInfoCache();
     size_t profile_index = cache.GetIndexOfProfileWithPath(profile->GetPath());
     if (profile_index != std::string::npos) {
       // Only show the profile picture and full name for the single profile
       // case. In the multi-profile case the profile picture is visible in the
@@ skipping 65 matching lines @@
   values->SetString("login_status_message", message);
   values->SetString("login_status_url",
       hide_sync ? std::string() : chrome::kSyncLearnMoreURL);
   values->SetString("login_status_advanced",
       hide_sync ? base::string16() :
       l10n_util::GetStringUTF16(IDS_SYNC_PROMO_NTP_BUBBLE_ADVANCED));
   values->SetString("login_status_dismiss",
       hide_sync ? base::string16() :
       l10n_util::GetStringUTF16(IDS_SYNC_PROMO_NTP_BUBBLE_OK));
 }