| Index: chrome/browser/services/gcm/gcm_profile_service.h
|
| diff --git a/chrome/browser/services/gcm/gcm_profile_service.h b/chrome/browser/services/gcm/gcm_profile_service.h
|
| index 633a6e8c7356953d3f57ef91c964a75b60e4cec7..f8a0aff37dc87afeebe15a6161802b7a77f2fe77 100644
|
| --- a/chrome/browser/services/gcm/gcm_profile_service.h
|
| +++ b/chrome/browser/services/gcm/gcm_profile_service.h
|
| @@ -117,9 +117,12 @@ class GCMProfileService : public BrowserContextKeyedService,
|
| const content::NotificationSource& source,
|
| const content::NotificationDetails& details) OVERRIDE;
|
|
|
| - // Checks in with GCM by creating and initializing GCMClient when the profile
|
| - // has been signed in.
|
| - void CheckIn(const std::string& username);
|
| + // Returns true if GCM is enabled for the rollout channel.
|
| + bool IsGCMChannelEnabled() const;
|
| +
|
| + // Ensures that the GCMClient is initialized and the GCM check-in is done when
|
| + // the profile was signed in.
|
| + void EnsureCheckedIn();
|
|
|
| // Checks out of GCM when the profile has been signed out. This will erase
|
| // all the cached and persisted data.
|
| @@ -155,7 +158,7 @@ class GCMProfileService : public BrowserContextKeyedService,
|
| void MessageSendError(const std::string& app_id,
|
| const std::string& message_id,
|
| GCMClient::Result result);
|
| - void FinishInitializationOnUI(bool ready);
|
| + void FinishInitializationOnUI();
|
| void GCMClientReady();
|
|
|
| // Returns the event router to fire the event for the given app.
|
|
|