summaryrefslogtreecommitdiffstats
path: root/google_apis/gcm/gcm_client_impl.cc
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.cc
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.cc')
-rw-r--r--google_apis/gcm/gcm_client_impl.cc8
1 files changed, 1 insertions, 7 deletions
diff --git a/google_apis/gcm/gcm_client_impl.cc b/google_apis/gcm/gcm_client_impl.cc
index 953baa9..a0a2142 100644
--- a/google_apis/gcm/gcm_client_impl.cc
+++ b/google_apis/gcm/gcm_client_impl.cc
@@ -176,7 +176,7 @@ void GCMClientImpl::Initialize(
const scoped_refptr<base::SequencedTaskRunner>& blocking_task_runner,
const scoped_refptr<net::URLRequestContextGetter>&
url_request_context_getter,
- GCMClient::Delegate* delegate) {
+ Delegate* delegate) {
DCHECK_EQ(UNINITIALIZED, state_);
DCHECK(url_request_context_getter);
DCHECK(delegate);
@@ -195,8 +195,6 @@ void GCMClientImpl::Initialize(
delegate_ = delegate;
- recorder_.SetDelegate(this);
-
state_ = INITIALIZED;
}
@@ -629,10 +627,6 @@ GCMClient::GCMStatistics GCMClientImpl::GetStatistics() const {
return stats;
}
-void GCMClientImpl::OnActivityRecorded() {
- delegate_->OnActivityRecorded();
-}
-
void GCMClientImpl::OnMessageReceivedFromMCS(const gcm::MCSMessage& message) {
switch (message.tag()) {
case kLoginResponseTag: