Show SigninErrorController username and status in AboutSigninInternals

components/signin/core/browser/about_signin_internals.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 "components/signin/core/browser/about_signin_internals.h"
 
 #include "base/command_line.h"
 #include "base/hash.h"
 #include "base/i18n/time_formatting.h"
 #include "base/logging.h"
@@ skipping 116 matching lines @@
   std::string time_pref = SigninStatusFieldToString(field) + ".time";
   prefs->ClearPref(value_pref);
   prefs->ClearPref(time_pref);
 }
 
 }  // anonymous namespace
 
 AboutSigninInternals::AboutSigninInternals(
     ProfileOAuth2TokenService* token_service,
     AccountTrackerService* account_tracker,
-    SigninManagerBase* signin_manager)
+    SigninManagerBase* signin_manager,
+    SigninErrorController* signin_error_controller)
     : token_service_(token_service),
       account_tracker_(account_tracker),
       signin_manager_(signin_manager),
-      client_(NULL) {}
+      client_(NULL),
+      signin_error_controller_(signin_error_controller) {}
 
 AboutSigninInternals::~AboutSigninInternals() {}
 
 void AboutSigninInternals::AddSigninObserver(
     AboutSigninInternals::Observer* observer) {
   signin_observers_.AddObserver(observer);
 }
 
 void AboutSigninInternals::RemoveSigninObserver(
     AboutSigninInternals::Observer* observer) {
@@ skipping 47 matching lines @@
 
   NotifyObservers();
 }
 
 void AboutSigninInternals::Initialize(SigninClient* client) {
   DCHECK(!client_);
   client_ = client;
 
   RefreshSigninPrefs();
 
+  signin_error_controller_->AddObserver(this);
   signin_manager_->AddSigninDiagnosticsObserver(this);
   token_service_->AddDiagnosticsObserver(this);
   cookie_changed_subscription_ = client_->AddCookieChangedCallback(
       GaiaUrls::GetInstance()->gaia_url(),
       "LSID",
       base::Bind(&AboutSigninInternals::OnCookieChanged,
                  base::Unretained(this)));
 }
 
 void AboutSigninInternals::Shutdown() {
+  signin_error_controller_->RemoveObserver(this);
   signin_manager_->RemoveSigninDiagnosticsObserver(this);
   token_service_->RemoveDiagnosticsObserver(this);
   cookie_changed_subscription_.reset();
 }
 
 void AboutSigninInternals::NotifyObservers() {
   if (!signin_observers_.might_have_observers())
     return;
 
   // TODO(robliao): Remove ScopedTracker below once https://crbug.com/422460 is
   // fixed.
   tracked_objects::ScopedTracker tracking_profile(
       FROM_HERE_WITH_EXPLICIT_FUNCTION(
           "422460 AboutSigninInternals::NotifyObservers"));
 
   const std::string product_version = client_->GetProductVersion();
 
   // TODO(robliao): Remove ScopedTracker below once https://crbug.com/422460 is
   // fixed.
   tracked_objects::ScopedTracker tracking_profile05(
       FROM_HERE_WITH_EXPLICIT_FUNCTION(
           "422460 AboutSigninInternals::NotifyObservers 0.5"));
 
   scoped_ptr<base::DictionaryValue> signin_status_value =
-      signin_status_.ToValue(account_tracker_, signin_manager_,
+      signin_status_.ToValue(account_tracker_,
+                             signin_manager_,
+                             signin_error_controller_,
                              product_version);
 
   // TODO(robliao): Remove ScopedTracker below once https://crbug.com/422460 is
   // fixed.
   tracked_objects::ScopedTracker tracking_profile1(
       FROM_HERE_WITH_EXPLICIT_FUNCTION(
           "422460 AboutSigninInternals::NotifyObservers1"));
 
   FOR_EACH_OBSERVER(AboutSigninInternals::Observer,
                     signin_observers_,
                     OnSigninStateChanged(signin_status_value.get()));
 }
 
 scoped_ptr<base::DictionaryValue> AboutSigninInternals::GetSigninStatus() {
-  return signin_status_.ToValue(account_tracker_, signin_manager_,
+  return signin_status_.ToValue(account_tracker_,
+                                signin_manager_,
+                                signin_error_controller_,
                                 client_->GetProductVersion()).Pass();
 }
 
 void AboutSigninInternals::OnAccessTokenRequested(
     const std::string& account_id,
     const std::string& consumer_id,
     const OAuth2TokenService::ScopeSet& scopes) {
   // TODO(robliao): Remove ScopedTracker below once https://crbug.com/422460 is
   // fixed.
   tracked_objects::ScopedTracker tracking_profile(
@@ skipping 52 matching lines @@
 
 void AboutSigninInternals::OnCookieChanged(const net::CanonicalCookie& cookie,
                                            bool removed) {
   DCHECK_EQ("LSID", cookie.Name());
   DCHECK_EQ(GaiaUrls::GetInstance()->gaia_url().host(), cookie.Domain());
   if (cookie.IsSecure() && cookie.IsHttpOnly()) {
     GetCookieAccountsAsync();
   }
 }
 
+void AboutSigninInternals::OnErrorChanged() {
+  NotifyObservers();
+}
+
 void AboutSigninInternals::GetCookieAccountsAsync() {
   // Don't bother calling /ListAccounts if no one will observe the response.
   if (!gaia_fetcher_ && signin_observers_.might_have_observers()) {
     // There is no list account request in flight.
     gaia_fetcher_.reset(new GaiaAuthFetcher(
         this, GaiaConstants::kChromeSource, client_->GetURLRequestContext()));
     gaia_fetcher_->StartListAccounts();
   }
 }
 
@@ skipping 131 matching lines @@
     TokenInfo* tmp = token_info_map[account_id][i];
     if (tmp->consumer_id == consumer_id && tmp->scopes == scopes)
       return tmp;
   }
   return NULL;
 }
 
 scoped_ptr<base::DictionaryValue> AboutSigninInternals::SigninStatus::ToValue(
     AccountTrackerService* account_tracker,
     SigninManagerBase* signin_manager,
+    SigninErrorController* signin_error_controller,
     const std::string& product_version) {
   // TODO(robliao): Remove ScopedTracker below once https://crbug.com/422460 is
   // fixed.
   tracked_objects::ScopedTracker tracking_profile1(
       FROM_HERE_WITH_EXPLICIT_FUNCTION(
           "422460 AboutSigninInternals::SigninStatus::ToValue1"));
 
   scoped_ptr<base::DictionaryValue> signin_status(new base::DictionaryValue());
   base::ListValue* signin_info = new base::ListValue();
   signin_status->Set("signin_info", signin_info);
@@ skipping 25 matching lines @@
                         static_cast<UntimedSigninStatusField>(ACCOUNT_ID)),
                     account_id);
     AddSectionEntry(basic_info,
                     SigninStatusFieldToLabel(
                         static_cast<UntimedSigninStatusField>(GAIA_ID)),
                     account_tracker->GetAccountInfo(account_id).gaia);
     AddSectionEntry(basic_info,
                     SigninStatusFieldToLabel(
                         static_cast<UntimedSigninStatusField>(USERNAME)),
                     signin_manager->GetAuthenticatedUsername());
+    if (signin_error_controller->HasError()) {
+      AddSectionEntry(basic_info, "Auth Error",
+          signin_error_controller->auth_error().ToString());
+      AddSectionEntry(basic_info, "Auth Error Username",
+          signin_error_controller->error_username());
+    } else {
+      AddSectionEntry(basic_info, "Auth Error", "None");
+    }
   }
 
 #if !defined(OS_CHROMEOS)
   // TODO(robliao): Remove ScopedTracker below once https://crbug.com/422460 is
   // fixed.
   tracked_objects::ScopedTracker tracking_profile3(
       FROM_HERE_WITH_EXPLICIT_FUNCTION(
           "422460 AboutSigninInternals::SigninStatus::ToValue3"));
 
   // Time and status information of the possible sign in types.
@@ skipping 46 matching lines @@
             "422460 AboutSigninInternals::SigninStatus::ToValue43"));
 
     for (size_t i = 0; i < tokens.size(); ++i) {
       base::DictionaryValue* token_info = tokens[i]->ToValue();
       token_details->Append(token_info);
     }
   }
 
   return signin_status.Pass();
 }