| Index: trunk/src/chrome/browser/services/gcm/gcm_profile_service.h
|
| ===================================================================
|
| --- trunk/src/chrome/browser/services/gcm/gcm_profile_service.h (revision 264317)
|
| +++ trunk/src/chrome/browser/services/gcm/gcm_profile_service.h (working copy)
|
| @@ -52,7 +52,7 @@
|
| GCMClient::Result result)> SendCallback;
|
| typedef base::Callback<void(GCMClient::Result result)> UnregisterCallback;
|
| typedef base::Callback<void(const GCMClient::GCMStatistics& stats)>
|
| - GetGCMStatisticsCallback;
|
| + RequestGCMStatisticsCallback;
|
|
|
| // Any change made to this enum should have corresponding change in the
|
| // GetGCMEnabledStateString(...) function.
|
| @@ -129,15 +129,10 @@
|
| // Returns true if the gcm client is ready.
|
| bool IsGCMClientReady() const;
|
|
|
| - // Get GCM client internal states and statistics.
|
| - // If clear_logs is true then activity logs will be cleared before the stats
|
| - // are returned.
|
| - void GetGCMStatistics(GetGCMStatisticsCallback callback,
|
| - bool clear_logs);
|
| + // Get GCM client internal states and statistics. If it has not been created
|
| + // then stats won't be modified.
|
| + void RequestGCMStatistics(RequestGCMStatisticsCallback callback);
|
|
|
| - // Enables/disables GCM activity recording, and then returns the stats.
|
| - void SetGCMRecording(GetGCMStatisticsCallback callback, bool recording);
|
| -
|
| private:
|
| friend class GCMProfileServiceTestConsumer;
|
| friend class extensions::ExtensionGCMAppHandlerTest;
|
| @@ -204,7 +199,7 @@
|
| // Returns the handler for the given app.
|
| GCMAppHandler* GetAppHandler(const std::string& app_id);
|
|
|
| - void GetGCMStatisticsFinished(GCMClient::GCMStatistics stats);
|
| + void RequestGCMStatisticsFinished(GCMClient::GCMStatistics stats);
|
|
|
| // The profile which owns this object.
|
| Profile* profile_;
|
| @@ -238,8 +233,8 @@
|
| // Callback map (from <app_id, message_id> to callback) for Send.
|
| std::map<std::pair<std::string, std::string>, SendCallback> send_callbacks_;
|
|
|
| - // Callback for GetGCMStatistics.
|
| - GetGCMStatisticsCallback request_gcm_statistics_callback_;
|
| + // Callback for RequestGCMStatistics.
|
| + RequestGCMStatisticsCallback request_gcm_statistics_callback_;
|
|
|
| // Used to pass a weak pointer to the IO worker.
|
| base::WeakPtrFactory<GCMProfileService> weak_ptr_factory_;
|
|
|