Add account_id to signin manager notifications.

chrome/browser/signin/signin_names_io_thread.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 CHROME_BROWSER_SIGNIN_SIGNIN_NAMES_IO_THREAD_H_
 #define CHROME_BROWSER_SIGNIN_SIGNIN_NAMES_IO_THREAD_H_
 
 #include <set>
 
 #include "base/basictypes.h"
@@ skipping 24 matching lines @@
   // Gets the set of email addresses of connected profiles.  This method should
   // only be called on the IO thread.
   const EmailSet& GetEmails() const;
 
   // Releases all resource held by object. Once released, GetEmails() no
   // longer works.
   void ReleaseResourcesOnUIThread();
 
  private:
   // SigninManagerBase::Observer:
-  virtual void GoogleSigninSucceeded(const std::string& username,
+  virtual void GoogleSigninSucceeded(const std::string& account_id,
+                                     const std::string& username,
                                      const std::string& password) OVERRIDE;
-  virtual void GoogleSignedOut(const std::string& username) OVERRIDE;
+  virtual void GoogleSignedOut(const std::string& account_id,
+                               const std::string& username) OVERRIDE;
 
   // SigninManagerFactory::Observer:
   virtual void SigninManagerCreated(SigninManagerBase* manager) OVERRIDE;
   virtual void SigninManagerShutdown(SigninManagerBase* manager) OVERRIDE;
 
   // Checks whether the current thread is the IO thread.
   void CheckOnIOThread() const;
 
   // Checks whether the current thread is the UI thread.
   void CheckOnUIThread() const;
 
   // Posts a task to the I/O thread to add or remove the email address from
   // the set.
   void PostTaskToIOThread(bool add, const base::string16& email);
 
   // Updates the email set on the I/O thread.  Protected for testing.
   void UpdateOnIOThread(bool add, const base::string16& email);
 
   EmailSet emails_;
 
   // The set of SigninManagerBase instances that this instance is currently
   // observing. Can only be accessed on the UI thread.
   std::set<SigninManagerBase*> observed_managers_;
   bool resources_released_;
 
   DISALLOW_COPY_AND_ASSIGN(SigninNamesOnIOThread);
 };
 
 #endif  // CHROME_BROWSER_SIGNIN_SIGNIN_NAMES_IO_THREAD_H_