Identity API: add multi-account support to token cache and request queues

chrome/browser/ui/webui/identity_internals_ui.cc

 // Copyright 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.
 
 #include "chrome/browser/ui/webui/identity_internals_ui.h"
 
 #include <set>
 #include <string>
 
 #include "base/bind.h"
@@ skipping 40 matching lines @@
   // includes deleting the |token_revoker|, removing the token from Identity API
   // cache and updating the UI that the token is gone.
   void OnTokenRevokerDone(IdentityInternalsTokenRevoker* token_revoker);
 
   // WebUIMessageHandler implementation.
   virtual void RegisterMessages() OVERRIDE;
 
  private:
   // Gets the name of an extension referred to by |token_cache_key| as a string.
   const std::string GetExtensionName(
-      const extensions::IdentityAPI::TokenCacheKey& token_cache_key);
+      const extensions::ExtensionTokenKey& token_cache_key);
 
   // Gets a list of scopes specified in |token_cache_key| and returns a pointer
   // to a ListValue containing the scopes. The caller gets ownership of the
   // returned object.
   ListValue* GetScopes(
-      const extensions::IdentityAPI::TokenCacheKey& token_cache_key);
+      const extensions::ExtensionTokenKey& token_cache_key);
 
   // Gets a localized status of the access token in |token_cache_value|.
   const base::string16 GetStatus(
       const extensions::IdentityTokenCacheValue& token_cache_value);
 
   // Gets a string representation of an expiration time of the access token in
   // |token_cache_value|.
   const std::string GetExpirationTime(
       const extensions::IdentityTokenCacheValue& token_cache_value);
 
   // Converts a pair of |token_cache_key| and |token_cache_value| to a
   // DictionaryValue object with corresponding information in a localized and
   // readable form and returns a pointer to created object. Caller gets the
   // ownership of the returned object.
   DictionaryValue* GetInfoForToken(
-      const extensions::IdentityAPI::TokenCacheKey& token_cache_key,
+      const extensions::ExtensionTokenKey& token_cache_key,
       const extensions::IdentityTokenCacheValue& token_cache_value);
 
   // Gets all of the tokens stored in IdentityAPI token cache and returns them
   // to the caller using Javascript callback function
   // |identity_internals.returnTokens()|.
   void GetInfoForAllTokens(const ListValue* args);
 
   // Initiates revoking of the token, based on the extension ID and token
   // passed as entries in the |args| list. Updates the caller of completion
   // using Javascript callback function |identity_internals.tokenRevokeDone()|.
@@ skipping 57 matching lines @@
                                    result);
 
   // Erase the revoker.
   ScopedVector<IdentityInternalsTokenRevoker>::iterator iter =
       std::find(token_revokers_.begin(), token_revokers_.end(), token_revoker);
   DCHECK(iter != token_revokers_.end());
   token_revokers_.erase(iter);
 }
 
 const std::string IdentityInternalsUIMessageHandler::GetExtensionName(
-    const extensions::IdentityAPI::TokenCacheKey& token_cache_key) {
+    const extensions::ExtensionTokenKey& token_cache_key) {
   ExtensionService* extension_service = extensions::ExtensionSystem::Get(
       Profile::FromWebUI(web_ui()))->extension_service();
   const extensions::Extension* extension =
       extension_service->extensions()->GetByID(token_cache_key.extension_id);
   if (!extension)
     return std::string();
   return extension->name();
 }
 
 ListValue* IdentityInternalsUIMessageHandler::GetScopes(
-    const extensions::IdentityAPI::TokenCacheKey& token_cache_key) {
+    const extensions::ExtensionTokenKey& token_cache_key) {
   ListValue* scopes_value = new ListValue();
   for (std::set<std::string>::const_iterator
            iter = token_cache_key.scopes.begin();
        iter != token_cache_key.scopes.end(); ++iter) {
     scopes_value->AppendString(*iter);
   }
   return scopes_value;
 }
 
 const base::string16 IdentityInternalsUIMessageHandler::GetStatus(
@@ skipping 12 matching lines @@
   return base::string16();
 }
 
 const std::string IdentityInternalsUIMessageHandler::GetExpirationTime(
     const extensions::IdentityTokenCacheValue& token_cache_value) {
   return UTF16ToUTF8(base::TimeFormatFriendlyDateAndTime(
       token_cache_value.expiration_time()));
 }
 
 DictionaryValue* IdentityInternalsUIMessageHandler::GetInfoForToken(
-    const extensions::IdentityAPI::TokenCacheKey& token_cache_key,
+    const extensions::ExtensionTokenKey& token_cache_key,
     const extensions::IdentityTokenCacheValue& token_cache_value) {
   DictionaryValue* token_data = new DictionaryValue();
   token_data->SetString(kExtensionId, token_cache_key.extension_id);
   token_data->SetString(kExtensionName, GetExtensionName(token_cache_key));
   token_data->Set(kScopes, GetScopes(token_cache_key));
   token_data->SetString(kStatus, GetStatus(token_cache_value));
   token_data->SetString(kAccessToken, token_cache_value.token());
   token_data->SetString(kTokenExpirationTime,
                         GetExpirationTime(token_cache_value));
   return token_data;
@@ skipping 85 matching lines @@
   html_source->AddResourcePath("identity_internals.js",
       IDR_IDENTITY_INTERNALS_JS);
   html_source->SetDefaultResource(IDR_IDENTITY_INTERNALS_HTML);
 
   content::WebUIDataSource::Add(Profile::FromWebUI(web_ui), html_source);
 
   web_ui->AddMessageHandler(new IdentityInternalsUIMessageHandler());
 }
 
 IdentityInternalsUI::~IdentityInternalsUI() {}
-