Add account_id to signin manager notifications.

chrome/browser/ui/webui/options/browser_options_handler.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/ui/webui/options/browser_options_handler.h"
 
 #include <string>
 #include <vector>
 
 #include "apps/app_window.h"
@@ skipping 757 matching lines @@
   registrar_.RemoveAll();
 #if defined(OS_WIN)
   ExtensionRegistry::Get(Profile::FromWebUI(web_ui()))->RemoveObserver(this);
 #endif
 }
 
 void BrowserOptionsHandler::OnStateChanged() {
   UpdateSyncState();
 }
 
-void BrowserOptionsHandler::GoogleSigninSucceeded(const std::string& username,
+void BrowserOptionsHandler::GoogleSigninSucceeded(const std::string& account_id,
+                                                  const std::string& username,
                                                   const std::string& password) {
   OnStateChanged();
 }
 
-void BrowserOptionsHandler::GoogleSignedOut(const std::string& username) {
+void BrowserOptionsHandler::GoogleSignedOut(const std::string& account_id,
+                                            const std::string& username) {
   OnStateChanged();
 }
 
 void BrowserOptionsHandler::PageLoadStarted() {
   page_initialized_ = false;
 }
 
 void BrowserOptionsHandler::InitializeHandler() {
   Profile* profile = Profile::FromWebUI(web_ui());
   PrefService* prefs = profile->GetPrefs();
@@ skipping 1068 matching lines @@
   extension = extensions::GetExtensionOverridingProxy(
       Profile::FromWebUI(web_ui()));
   AppendExtensionData("proxy", extension, &extension_controlled);
 
   web_ui()->CallJavascriptFunction("BrowserOptions.toggleExtensionIndicators",
                                    extension_controlled);
 #endif  // defined(OS_WIN)
 }
 
 }  // namespace options