Multiple account support in chrome.identity.getAuthToken

chrome/browser/extensions/api/identity/gaia_web_auth_flow.h

 // Copyright (c) 2013 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_EXTENSIONS_API_IDENTITY_GAIA_WEB_AUTH_FLOW_H_
 #define CHROME_BROWSER_EXTENSIONS_API_IDENTITY_GAIA_WEB_AUTH_FLOW_H_
 
 #include "chrome/browser/extensions/api/identity/web_auth_flow.h"
 #include "chrome/browser/ui/host_desktop.h"
 #include "chrome/common/extensions/api/identity/oauth2_manifest_handler.h"
 #include "google_apis/gaia/ubertoken_fetcher.h"
 
 namespace extensions {
 
 // Implements a web-based OAuth2 scope approval dialog. This flow has
 // four parts:
-// 1. Fetch an ubertoken for the signed-in user.
+// 1. Fetch an ubertoken for a signed-in user.
 // 2. Use the ubertoken to get session cookies using MergeSession.
 // 3. Start the OAuth flow and wait for final redirect.
 // 4. Parse results from the fragment component of the final redirect URI.
 //
 // The OAuth flow is a special version of the OAuth2 out-of-band flow
 // where the final response page's title contains the
 // redirect_uri. The redirect URI has an unusual format to prevent its
 // use in other contexts. The scheme of the URI is a reversed version
 // of the OAuth client ID, and the path starts with the Chrome
 // extension ID. For example, an app with the OAuth client ID
@@ skipping 25 matching lines @@
     virtual void OnGaiaFlowFailure(Failure failure,
                                    GoogleServiceAuthError service_error,
                                    const std::string& oauth_error) = 0;
     // Called when the OAuth2 flow completes.
     virtual void OnGaiaFlowCompleted(const std::string& access_token,
                                      const std::string& expiration) = 0;
   };
 
   GaiaWebAuthFlow(Delegate* delegate,
                   Profile* profile,
+                  const std::string& account_id,
                   const std::string& extension_id,
                   const OAuth2Info& oauth2_info,
                   const std::string& locale);
   virtual ~GaiaWebAuthFlow();
 
   // Starts the flow by fetching an ubertoken. Can override for testing.
   virtual void Start();
 
   // UbertokenConsumer implementation:
   virtual void OnUbertokenSuccess(const std::string& token) OVERRIDE;
   virtual void OnUbertokenFailure(const GoogleServiceAuthError& error) OVERRIDE;
 
   // WebAuthFlow::Delegate implementation.
   virtual void OnAuthFlowFailure(WebAuthFlow::Failure failure) OVERRIDE;
   virtual void OnAuthFlowURLChange(const GURL& redirect_url) OVERRIDE;
   virtual void OnAuthFlowTitleChange(const std::string& title) OVERRIDE;
 
  private:
   // Creates a WebAuthFlow, which will navigate to |url|. Can override
   // for testing. Used to kick off the MergeSession (step #2).
   virtual scoped_ptr<WebAuthFlow> CreateWebAuthFlow(GURL url);
 
   Delegate* delegate_;
   Profile* profile_;
+  std::string account_id_;
   chrome::HostDesktopType host_desktop_type_;
   std::string redirect_scheme_;
   std::string redirect_path_prefix_;
   GURL auth_url_;
   scoped_ptr<UbertokenFetcher> ubertoken_fetcher_;
   scoped_ptr<WebAuthFlow> web_flow_;
 
   DISALLOW_COPY_AND_ASSIGN(GaiaWebAuthFlow);
 };
 
-}  // extensions
+}  // namespace extensions
 
 #endif  // CHROME_BROWSER_EXTENSIONS_API_IDENTITY_GAIA_WEB_AUTH_FLOW_H_