Show GAIA/cookie accounts on the signin-internals page.

components/signin/core/browser/about_signin_internals.h

 // 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.
 
 #ifndef COMPONENTS_SIGNIN_CORE_BROWSER_ABOUT_SIGNIN_INTERNALS_H_
 #define COMPONENTS_SIGNIN_CORE_BROWSER_ABOUT_SIGNIN_INTERNALS_H_
 
 #include <map>
 #include <string>
 
 #include "base/memory/scoped_ptr.h"
 #include "base/observer_list.h"
 #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_internals_util.h"
 #include "components/signin/core/browser/signin_manager.h"
+#include "google_apis/gaia/gaia_auth_consumer.h"
 #include "google_apis/gaia/oauth2_token_service.h"
 
+class GaiaAuthFetcher;
 class ProfileOAuth2TokenService;
 class SigninClient;
 class SigninManagerBase;
 
 // Many values in SigninStatus are also associated with a timestamp.
 // This makes it easier to keep values and their associated times together.
 typedef std::pair<std::string, std::string> TimedSigninStatusValue;
 
 // This class collects authentication, signin and token information
 // to propagate to about:signin-internals via SigninInternalsUI.
 class AboutSigninInternals
     : public KeyedService,
       public signin_internals_util::SigninDiagnosticsObserver,
-      public OAuth2TokenService::DiagnosticsObserver {
+      public OAuth2TokenService::DiagnosticsObserver,
+      public GaiaAuthConsumer {
  public:
   class Observer {
    public:
     // |info| will contain the dictionary of signin_status_ values as indicated
     // in the comments for GetSigninStatus() below.
     virtual void OnSigninStateChanged(
         scoped_ptr<base::DictionaryValue> info) = 0;
+
+    // Notification that the cookie accounts are ready to be displayed.
+    virtual void OnCookieAccountsFetched(
+        scoped_ptr<base::DictionaryValue> info) = 0;
   };
 
   AboutSigninInternals(ProfileOAuth2TokenService* token_service,
                        SigninManagerBase* signin_manager);
   virtual ~AboutSigninInternals();
 
   // Each instance of SigninInternalsUI adds itself as an observer to be
   // notified of all updates that AboutSigninInternals receives.
   void AddSigninObserver(Observer* observer);
   void RemoveSigninObserver(Observer* observer);
@@ skipping 24 matching lines @@
   //       },
   //       { "title": "Detailed Information",
   //        "data": [List of {"label" : "foo-field", "value" : "foo"} elems]
   //       }],
   //   "token_info" :
   //     [ List of {"name": "foo-name", "token" : "foo-token",
   //                 "status": "foo_stat", "time" : "foo_time"} elems]
   //  }
   scoped_ptr<base::DictionaryValue> GetSigninStatus();
 
+  // Triggers a ListAccounts call to acquire a list of the email addresses
+  // corresponding to the cookies residing on the current cookie jar.
+  void GetCookieAccountsAsync();
+
   // OAuth2TokenService::DiagnosticsObserver implementations.
   virtual void OnAccessTokenRequested(
       const std::string& account_id,
       const std::string& consumer_id,
       const OAuth2TokenService::ScopeSet& scopes) OVERRIDE;
   virtual void OnFetchAccessTokenComplete(
       const std::string& account_id,
       const std::string& consumer_id,
       const OAuth2TokenService::ScopeSet& scopes,
       GoogleServiceAuthError error,
@@ skipping 20 matching lines @@
 
     std::string consumer_id;              // service that requested the token.
     OAuth2TokenService::ScopeSet scopes;  // Scoped that are requested.
     base::Time request_time;
     base::Time receive_time;
     base::Time expiration_time;
     GoogleServiceAuthError error;
     bool removed_;
   };
 
+  // Encapsulates diagnostic information about cookie accounts
+  struct CookieInfo {
+    CookieInfo(const std::string& email);
+    ~CookieInfo();
+    base::DictionaryValue* ToValue() const;
+
+    static bool LessThan(const TokenInfo* a, const TokenInfo* b);
+
+    // Called when the cookie is invalidated.
+    void Invalidate();
+
+    std::string email;              // Email address of the token.
+    bool valid;                     // If the cookie is considered valid.
+    bool removed_;

[Roger Tawa OOO till Jul 10th, 2014/08/06 20:29:42]

Don't need trailing _ for struct.  Or put it on all members.

[Mike Lerman, 2014/08/07 16:39:26]

Removed the whole struct, not even using it!

+  };
+
   // Map account id to tokens associated to the account.
   typedef std::map<std::string, std::vector<TokenInfo*> > TokenInfoMap;
 
   // Encapsulates both authentication and token related information. Used
   // by SigninInternals to maintain information that needs to be shown in
   // the about:signin-internals page.
   struct SigninStatus {
     std::vector<std::string> untimed_signin_fields;
     std::vector<TimedSigninStatusValue> timed_signin_fields;
     TokenInfoMap token_info_map;
@@ skipping 20 matching lines @@
     //                           "scopes" : requested scoped,
     //                           "request_time" : request time,
     //                           "status" : request status} elems]
     //       }],
     //  }
     scoped_ptr<base::DictionaryValue> ToValue(std::string product_version);
   };
 
   void NotifyObservers();
 
+
+  // Overriden from GaiaAuthConsumer.
+  virtual void OnListAccountsSuccess(const std::string& data) OVERRIDE;
+  virtual void OnListAccountsFailure(const GoogleServiceAuthError& error)
+      OVERRIDE;
+
+  // Callback for ListAccounts. Once the email addresses are fetched from GAIA,
+  // they are pushed to the signin_internals_ui.
+  void OnListAccountsComplete(
+      std::vector<std::pair<std::string, bool> >& gaia_accounts);
+
+  // Called when a cookie changes. If the cookie relates to a GAIA LSID cookie,
+  // then we call ListAccounts and update the UI element.
+  void OnCookieChanged(const net::CanonicalCookie* cookie);
+
   // Weak pointer to the token service.
   ProfileOAuth2TokenService* token_service_;
 
   // Weak pointer to the signin manager.
   SigninManagerBase* signin_manager_;
 
   // Weak pointer to the client.
   SigninClient* client_;
 
+  // Fetcher for information about accounts in the cookie jar from GAIA.
+  scoped_ptr<GaiaAuthFetcher> gaia_fetcher_;
+
   // Encapsulates the actual signin and token related values.
   // Most of the values are mirrored in the prefs for persistence.
   SigninStatus signin_status_;
 
   ObserverList<Observer> signin_observers_;
 
+  scoped_ptr<SigninClient::CookieChangedCallbackList::Subscription>
+      cookie_changed_subscription_;
+
   DISALLOW_COPY_AND_ASSIGN(AboutSigninInternals);
 };
 
 #endif  // COMPONENTS_SIGNIN_CORE_BROWSER_ABOUT_SIGNIN_INTERNALS_H_