| Index: google_apis/gcm/gcm_client_impl.h
|
| diff --git a/google_apis/gcm/gcm_client_impl.h b/google_apis/gcm/gcm_client_impl.h
|
| index 47ef48a10209cc9fa6833450f083b165767f782c..85f206b435798b5f608c2d7745c3086b30fe3dbd 100644
|
| --- a/google_apis/gcm/gcm_client_impl.h
|
| +++ b/google_apis/gcm/gcm_client_impl.h
|
| @@ -73,8 +73,7 @@
|
| // with MCS) and other pieces of GCM infrastructure like Registration and
|
| // Checkins. It also allows for registering user delegates that host
|
| // applications that send and receive messages.
|
| -class GCM_EXPORT GCMClientImpl
|
| - : public GCMClient, public GCMStatsRecorder::Delegate {
|
| +class GCM_EXPORT GCMClientImpl : public GCMClient {
|
| public:
|
| explicit GCMClientImpl(scoped_ptr<GCMInternalsBuilder> internals_builder);
|
| virtual ~GCMClientImpl();
|
| @@ -87,7 +86,7 @@
|
| const scoped_refptr<base::SequencedTaskRunner>& blocking_task_runner,
|
| const scoped_refptr<net::URLRequestContextGetter>&
|
| url_request_context_getter,
|
| - GCMClient::Delegate* delegate) OVERRIDE;
|
| + Delegate* delegate) OVERRIDE;
|
| virtual void Load() OVERRIDE;
|
| virtual void Stop() OVERRIDE;
|
| virtual void CheckOut() OVERRIDE;
|
| @@ -100,7 +99,6 @@
|
| virtual void SetRecording(bool recording) OVERRIDE;
|
| virtual void ClearActivityLogs() OVERRIDE;
|
| virtual GCMStatistics GetStatistics() const OVERRIDE;
|
| - virtual void OnActivityRecorded() OVERRIDE;
|
|
|
| private:
|
| // State representation of the GCMClient.
|
| @@ -237,7 +235,7 @@
|
| // State of the GCM Client Implementation.
|
| State state_;
|
|
|
| - GCMClient::Delegate* delegate_;
|
| + Delegate* delegate_;
|
|
|
| // Device checkin info (android ID and security token used by device).
|
| CheckinInfo device_checkin_info_;
|
|
|