Add account_id to signin manager notifications.

chrome/browser/signin/signin_names_io_thread.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 "chrome/browser/signin/signin_names_io_thread.h"
 
 #include "base/logging.h"
 #include "base/strings/utf_string_conversions.h"
 #include "chrome/browser/browser_process.h"
 #include "chrome/browser/chrome_notification_types.h"
@@ skipping 53 matching lines @@
 void SigninNamesOnIOThread::SigninManagerCreated(SigninManagerBase* manager) {
   manager->AddObserver(this);
   observed_managers_.insert(manager);
 }
 
 void SigninNamesOnIOThread::SigninManagerShutdown(SigninManagerBase* manager) {
   manager->RemoveObserver(this);
   observed_managers_.erase(manager);
 }
 
-void SigninNamesOnIOThread::GoogleSigninSucceeded(const std::string& username,
+void SigninNamesOnIOThread::GoogleSigninSucceeded(const std::string& account_id,
+                                                  const std::string& username,
                                                   const std::string& password) {
   PostTaskToIOThread(true, base::UTF8ToUTF16(username));
 }
 
-void SigninNamesOnIOThread::GoogleSignedOut(const std::string& username) {
+void SigninNamesOnIOThread::GoogleSignedOut(const std::string& account_id,
+                                            const std::string& username) {
   PostTaskToIOThread(false, base::UTF8ToUTF16(username));
 }
 
 void SigninNamesOnIOThread::CheckOnIOThread() const {
   DCHECK(content::BrowserThread::CurrentlyOn(content::BrowserThread::IO));
 }
 
 void SigninNamesOnIOThread::CheckOnUIThread() const {
   DCHECK(content::BrowserThread::CurrentlyOn(content::BrowserThread::UI));
 }
@@ skipping 16 matching lines @@
 
 void SigninNamesOnIOThread::UpdateOnIOThread(bool add,
                                              const base::string16& email) {
   CheckOnIOThread();
   if (add) {
     emails_.insert(email);
   } else {
     emails_.erase(email);
   }
 }