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

Unified Diff: components/signin/core/browser/about_signin_internals.h

Issue 1025323004: Show SigninErrorController username and status in AboutSigninInternals (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Address feedback. Created 5 years, 9 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
Index: components/signin/core/browser/about_signin_internals.h
diff --git a/components/signin/core/browser/about_signin_internals.h b/components/signin/core/browser/about_signin_internals.h
index 9e285c4283ad1508ac4aa565b3de526168baa32c..196a4fc1eacc5427e484c0eb6436f827b608731f 100644
--- a/components/signin/core/browser/about_signin_internals.h
+++ b/components/signin/core/browser/about_signin_internals.h
@@ -14,6 +14,7 @@
#include "base/values.h"
#include "components/keyed_service/core/keyed_service.h"
#include "components/signin/core/browser/signin_client.h"
+#include "components/signin/core/browser/signin_error_controller.h"
#include "components/signin/core/browser/signin_internals_util.h"
#include "components/signin/core/browser/signin_manager.h"
#include "google_apis/gaia/gaia_auth_consumer.h"
@@ -35,7 +36,8 @@ class AboutSigninInternals
public signin_internals_util::SigninDiagnosticsObserver,
public OAuth2TokenService::DiagnosticsObserver,
public GaiaAuthConsumer,
- SigninManagerBase::Observer {
+ SigninManagerBase::Observer,
+ SigninErrorController::Observer {
public:
class Observer {
public:
@@ -49,7 +51,8 @@ class AboutSigninInternals
AboutSigninInternals(ProfileOAuth2TokenService* token_service,
AccountTrackerService* account_tracker,
- SigninManagerBase* signin_manager);
+ SigninManagerBase* signin_manager,
+ SigninErrorController* signin_error_controller);
~AboutSigninInternals() override;
// Each instance of SigninInternalsUI adds itself as an observer to be
@@ -147,6 +150,7 @@ class AboutSigninInternals
scoped_ptr<base::DictionaryValue> ToValue(
AccountTrackerService* account_tracker,
SigninManagerBase* signin_manager,
+ SigninErrorController* signin_error_controller,
const std::string& product_version);
};
@@ -191,6 +195,9 @@ class AboutSigninInternals
// then we call ListAccounts and update the UI element.
void OnCookieChanged(const net::CanonicalCookie& cookie, bool removed);
+ // SigninErrorController::Observer implementation
+ void OnErrorChanged() override;
+
// Weak pointer to the token service.
ProfileOAuth2TokenService* token_service_;
@@ -203,6 +210,9 @@ class AboutSigninInternals
// Weak pointer to the client.
SigninClient* client_;
+ // Weak pointer to the SigninErrorController
+ SigninErrorController* signin_error_controller_;
+
// Fetcher for information about accounts in the cookie jar from GAIA.
scoped_ptr<GaiaAuthFetcher> gaia_fetcher_;
« no previous file with comments | « chrome/browser/signin/about_signin_internals_factory.cc ('k') | components/signin/core/browser/about_signin_internals.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698