| Index: components/gcm_driver/instance_id/instance_id_impl.h
|
| diff --git a/components/gcm_driver/instance_id/instance_id_impl.h b/components/gcm_driver/instance_id/instance_id_impl.h
|
| index 1f8749eb9056712daf876f4b6f9cf01f19f5b32d..dd4569a5f76752dc2f2542418677239d3af10398 100644
|
| --- a/components/gcm_driver/instance_id/instance_id_impl.h
|
| +++ b/components/gcm_driver/instance_id/instance_id_impl.h
|
| @@ -18,7 +18,6 @@
|
| #include "components/gcm_driver/instance_id/instance_id.h"
|
|
|
| namespace gcm {
|
| -class GCMDriver;
|
| class InstanceIDHandler;
|
| } // namespace gcm
|
|
|
| @@ -27,7 +26,7 @@ namespace instance_id {
|
| // InstanceID implementation for desktop and iOS.
|
| class InstanceIDImpl : public InstanceID {
|
| public:
|
| - InstanceIDImpl(const std::string& app_id, gcm::GCMDriver* gcm_driver);
|
| + InstanceIDImpl(const std::string& app_id, gcm::InstanceIDHandler* handler);
|
| ~InstanceIDImpl() override;
|
|
|
| // InstanceID:
|
| @@ -43,8 +42,6 @@ class InstanceIDImpl : public InstanceID {
|
| void DeleteID(const DeleteIDCallback& callback) override;
|
|
|
| private:
|
| - gcm::InstanceIDHandler* GetInstanceIDHandler() const;
|
| -
|
| void EnsureIDGenerated();
|
|
|
| void OnGetTokenCompleted(const GetTokenCallback& callback,
|
| @@ -69,8 +66,6 @@ class InstanceIDImpl : public InstanceID {
|
| const DeleteTokenCallback& callback);
|
| void DoDeleteID(const DeleteIDCallback& callback);
|
|
|
| - gcm::GCMDriver* gcm_driver_; // Not owned.
|
| -
|
| gcm::GCMDelayedTaskController delayed_task_controller_;
|
|
|
| // The generated Instance ID.
|
|
|