Adding Send to Gaia ID feature

components/gcm_driver/gcm_account_mapper.h

 // Copyright 2014 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 COMPONENTS_GCM_DRIVER_GCM_ACCOUNT_MAPPER_H_
 #define COMPONENTS_GCM_DRIVER_GCM_ACCOUNT_MAPPER_H_
 
 #include <string>
 #include <vector>
 
+#include "base/callback.h"
 #include "base/macros.h"
 #include "base/memory/scoped_ptr.h"
 #include "base/memory/weak_ptr.h"
 #include "components/gcm_driver/gcm_app_handler.h"
 #include "components/gcm_driver/gcm_client.h"
 #include "google_apis/gcm/engine/account_mapping.h"
 
 namespace base {
 class Clock;
 }
 
 namespace gcm {
 
 class GCMDriver;
 extern const char kGCMAccountMapperAppId[];
 
 // Class for mapping signed-in GAIA accounts to the GCM Device ID.
 class GCMAccountMapper : public GCMAppHandler {
  public:
   // List of account mappings.
   typedef std::vector<AccountMapping> AccountMappings;
+  typedef base::Callback<void(const std::string& app_id,
+                              const GCMClient::IncomingMessage& message)>
+      DispatchMessageCallback;
 
   explicit GCMAccountMapper(GCMDriver* gcm_driver);
   ~GCMAccountMapper() override;
 
-  void Initialize(const AccountMappings& account_mappings);
+  void Initialize(const AccountMappings& account_mappings,
+                  const DispatchMessageCallback& callback);
 
   // Called by AccountTracker, when a new list of account tokens is available.
   // This will cause a refresh of account mappings and sending updates to GCM.
   void SetAccountTokens(
       const std::vector<GCMClient::AccountTokenInfo>& account_tokens);
 
   // Implementation of GCMAppHandler:
   void ShutdownHandler() override;
   void OnMessage(const std::string& app_id,
                  const GCMClient::IncomingMessage& message) override;
@@ skipping 48 matching lines @@
   // Returns iterator that can be used to delete the account.
   AccountMappings::iterator FindMappingByMessageId(
       const std::string& message_id);
 
   // Sets the clock for testing.
   void SetClockForTesting(scoped_ptr<base::Clock> clock);
 
   // GCMDriver owns GCMAccountMapper.
   GCMDriver* gcm_driver_;
 
+  // Callback to GCMDriver to dispatch messages send to Gaia ID.

[Nicolas Zea, 2015/02/27 21:33:21]

nit: s/send/sent

[fgorski, 2015/02/27 22:12:19]

Done.

+  DispatchMessageCallback dispatch_message_callback_;
+
   // Clock for timestamping status changes.
   scoped_ptr<base::Clock> clock_;
 
   // Currnetly tracked account mappings.
   AccountMappings accounts_;
 
   std::vector<GCMClient::AccountTokenInfo> pending_account_tokens_;
 
   // GCM Registration ID of the account mapper.
   std::string registration_id_;
 
   bool initialized_;
 
   base::WeakPtrFactory<GCMAccountMapper> weak_ptr_factory_;
 
   DISALLOW_COPY_AND_ASSIGN(GCMAccountMapper);
 };
 
 }  // namespace gcm
 
 #endif  // COMPONENTS_GCM_DRIVER_GCM_ACCOUNT_MAPPER_H_