summaryrefslogtreecommitdiffstats
path: root/google_apis/gcm/gcm_client_impl.h
diff options
context:
space:
mode:
authornkostylev@chromium.org <nkostylev@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2014-05-08 12:26:13 +0000
committernkostylev@chromium.org <nkostylev@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2014-05-08 12:26:13 +0000
commitd31f8a126dd50a6deebea4e2e6ad8fc0ed2a5ad3 (patch)
tree240b8bd75541d78c2cd448d3caf32fae54f67d4b /google_apis/gcm/gcm_client_impl.h
parent639569a49e6efeb8028235edc5d68b880f399982 (diff)
downloadchromium_src-d31f8a126dd50a6deebea4e2e6ad8fc0ed2a5ad3.zip
chromium_src-d31f8a126dd50a6deebea4e2e6ad8fc0ed2a5ad3.tar.gz
chromium_src-d31f8a126dd50a6deebea4e2e6ad8fc0ed2a5ad3.tar.bz2
Revert of Enable auto-refreshing of the gcm-internals page whenever a GCM activity is recorded. (https://codereview.chromium.org/266913015/)
Reason for revert: Introduces crash on sign in on Chrome OS. BUG=371297 https://code.google.com/p/chromium/issues/detail?id=371297 Original issue's description: > Enable auto-refreshing of the gcm-internals page whenever a GCM activity is recorded. > > BUG=341256 > > Committed: https://src.chromium.org/viewvc/chrome?view=rev&revision=268976 TBR=jianli@chromium.org,zea@chromium.org,juyik@chromium.org NOTREECHECKS=true NOTRY=true BUG=341256 Review URL: https://codereview.chromium.org/273753005 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@269053 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'google_apis/gcm/gcm_client_impl.h')
-rw-r--r--google_apis/gcm/gcm_client_impl.h8
1 files changed, 3 insertions, 5 deletions
diff --git a/google_apis/gcm/gcm_client_impl.h b/google_apis/gcm/gcm_client_impl.h
index 47ef48a..85f206b 100644
--- a/google_apis/gcm/gcm_client_impl.h
+++ b/google_apis/gcm/gcm_client_impl.h
@@ -73,8 +73,7 @@ class GCM_EXPORT GCMInternalsBuilder {
// 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 @@ class GCM_EXPORT GCMClientImpl
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 @@ class GCM_EXPORT GCMClientImpl
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 @@ class GCM_EXPORT GCMClientImpl
// 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_;