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

chrome/browser/signin/chrome_signin_client.cc

 // Copyright 2014 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/signin/chrome_signin_client.h"
 
 #include "base/command_line.h"
 #include "base/guid.h"
 #include "base/prefs/pref_service.h"
 #include "chrome/browser/chrome_notification_types.h"
@@ skipping 22 matching lines @@
 using content::ChildProcessHost;
 using content::RenderProcessHost;
 
 namespace {
 
 const char kGoogleAccountsUrl[] = "https://accounts.google.com";
 
 }  // namespace
 
 ChromeSigninClient::ChromeSigninClient(Profile* profile)
-    : profile_(profile), signin_host_id_(ChildProcessHost::kInvalidUniqueID) {}
+    : profile_(profile), signin_host_id_(ChildProcessHost::kInvalidUniqueID) {
+  callbacks_.set_removal_callback(
+    base::Bind(&ChromeSigninClient::UnregisterForCookieChangedNotification,
+               base::Unretained(this)));
+}
 
 ChromeSigninClient::~ChromeSigninClient() {
   UnregisterForCookieChangedNotification();
 
   std::set<RenderProcessHost*>::iterator i;
   for (i = signin_hosts_observed_.begin(); i != signin_hosts_observed_.end();
        ++i) {
     (*i)->RemoveObserver(this);
   }
 }
@@ skipping 111 matching lines @@
          !switches::IsEnableAccountConsistency();
 }
 
 std::string ChromeSigninClient::GetProductVersion() {
   chrome::VersionInfo chrome_version;
   if (!chrome_version.is_valid())
     return "invalid";
   return chrome_version.CreateVersionString();
 }
 
-void ChromeSigninClient::SetCookieChangedCallback(
+scoped_ptr<SigninClient::CookieChangedCallbackList::Subscription>
+ChromeSigninClient::AddCookieChangedCallback(
     const CookieChangedCallback& callback) {
-  if (callback_.Equals(callback))
-    return;
-
-  // There should be only one callback active at a time.
-  DCHECK(callback.is_null() || callback_.is_null());
-  callback_ = callback;
-  if (!callback_.is_null())
-    RegisterForCookieChangedNotification();
-  else
-    UnregisterForCookieChangedNotification();
+  scoped_ptr<SigninClient::CookieChangedCallbackList::Subscription>
+    subscription = callbacks_.Add(callback);
+  RegisterForCookieChangedNotification();
+  return subscription.Pass();
 }
 
 void ChromeSigninClient::GoogleSigninSucceeded(const std::string& username,
                                                const std::string& password) {
 #if !defined(OS_ANDROID)
   // Don't store password hash except for users of account consistency features.
   if (switches::IsEnableAccountConsistency())
     chrome::SetLocalAuthCredentials(profile_, password);
 #endif
 }
 
 void ChromeSigninClient::Observe(int type,
                                  const content::NotificationSource& source,
                                  const content::NotificationDetails& details) {
   switch (type) {
     case chrome::NOTIFICATION_COOKIE_CHANGED: {
-      DCHECK(!callback_.is_null());
+      DCHECK(!callbacks_.empty());

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

Maybe don't need this DCHECK anymore?

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

It still seems like valid for sanity - we should never be set to observe unless
we've added at least one registration and callback.

       const net::CanonicalCookie* cookie =
           content::Details<ChromeCookieDetails>(details).ptr()->cookie;
-      callback_.Run(cookie);
+      callbacks_.Notify(cookie);
       break;
     }
     default:
       NOTREACHED();
       break;
   }
 }
 
 void ChromeSigninClient::RegisterForCookieChangedNotification() {
+  if (callbacks_.empty())
+    return;
   content::Source<Profile> source(profile_);
-  DCHECK(!registrar_.IsRegistered(
-      this, chrome::NOTIFICATION_COOKIE_CHANGED, source));
+  if (!registrar_.IsRegistered(
+      this, chrome::NOTIFICATION_COOKIE_CHANGED, source))
   registrar_.Add(this, chrome::NOTIFICATION_COOKIE_CHANGED, source);
 }
 
 void ChromeSigninClient::UnregisterForCookieChangedNotification() {
+  if (!callbacks_.empty())
+    return;
   // Note that it's allowed to call this method multiple times without an
   // intervening call to |RegisterForCookieChangedNotification()|.
   content::Source<Profile> source(profile_);
   if (!registrar_.IsRegistered(
       this, chrome::NOTIFICATION_COOKIE_CHANGED, source))
     return;
   registrar_.Remove(this, chrome::NOTIFICATION_COOKIE_CHANGED, source);
 }