Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(482)

Unified Diff: google_apis/gcm/engine/gcm_store_impl.h

Issue 625293003: replace OVERRIDE and FINAL with override and final in google_apis/ (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: another rebase on master Created 6 years, 2 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « google_apis/gcm/engine/fake_connection_handler.h ('k') | google_apis/gcm/engine/mcs_client_unittest.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: google_apis/gcm/engine/gcm_store_impl.h
diff --git a/google_apis/gcm/engine/gcm_store_impl.h b/google_apis/gcm/engine/gcm_store_impl.h
index f860973ea8b33c7c71d4f3d27e0414fed3f33e4a..b597d6f95b0e67b8e1cf81a998f48f321a988af0 100644
--- a/google_apis/gcm/engine/gcm_store_impl.h
+++ b/google_apis/gcm/engine/gcm_store_impl.h
@@ -31,67 +31,67 @@ class GCM_EXPORT GCMStoreImpl : public GCMStore {
virtual ~GCMStoreImpl();
// Load the directory and pass the initial state back to caller.
- virtual void Load(const LoadCallback& callback) OVERRIDE;
+ virtual void Load(const LoadCallback& callback) override;
// Closes the GCM store.
- virtual void Close() OVERRIDE;
+ virtual void Close() override;
// Clears the GCM store of all data and destroys any LevelDB files associated
// with this store.
// WARNING: this will permanently destroy any pending outgoing messages
// and require the device to re-create credentials and serial number mapping
// tables.
- virtual void Destroy(const UpdateCallback& callback) OVERRIDE;
+ virtual void Destroy(const UpdateCallback& callback) override;
// Sets this device's messaging credentials.
virtual void SetDeviceCredentials(uint64 device_android_id,
uint64 device_security_token,
- const UpdateCallback& callback) OVERRIDE;
+ const UpdateCallback& callback) override;
// Registration info.
virtual void AddRegistration(const std::string& app_id,
const linked_ptr<RegistrationInfo>& registration,
- const UpdateCallback& callback) OVERRIDE;
+ const UpdateCallback& callback) override;
virtual void RemoveRegistration(const std::string& app_id,
- const UpdateCallback& callback) OVERRIDE;
+ const UpdateCallback& callback) override;
// Unacknowledged incoming message handling.
virtual void AddIncomingMessage(const std::string& persistent_id,
- const UpdateCallback& callback) OVERRIDE;
+ const UpdateCallback& callback) override;
virtual void RemoveIncomingMessage(const std::string& persistent_id,
- const UpdateCallback& callback) OVERRIDE;
+ const UpdateCallback& callback) override;
virtual void RemoveIncomingMessages(const PersistentIdList& persistent_ids,
- const UpdateCallback& callback) OVERRIDE;
+ const UpdateCallback& callback) override;
// Unacknowledged outgoing messages handling.
virtual bool AddOutgoingMessage(const std::string& persistent_id,
const MCSMessage& message,
- const UpdateCallback& callback) OVERRIDE;
+ const UpdateCallback& callback) override;
virtual void OverwriteOutgoingMessage(const std::string& persistent_id,
const MCSMessage& message,
const UpdateCallback& callback)
- OVERRIDE;
+ override;
virtual void RemoveOutgoingMessage(const std::string& persistent_id,
- const UpdateCallback& callback) OVERRIDE;
+ const UpdateCallback& callback) override;
virtual void RemoveOutgoingMessages(const PersistentIdList& persistent_ids,
- const UpdateCallback& callback) OVERRIDE;
+ const UpdateCallback& callback) override;
// Sets last device's checkin information.
virtual void SetLastCheckinInfo(const base::Time& time,
const std::set<std::string>& accounts,
- const UpdateCallback& callback) OVERRIDE;
+ const UpdateCallback& callback) override;
// G-service settings handling.
virtual void SetGServicesSettings(
const std::map<std::string, std::string>& settings,
const std::string& settings_digest,
- const UpdateCallback& callback) OVERRIDE;
+ const UpdateCallback& callback) override;
// Sets the account information related to device to account mapping.
virtual void AddAccountMapping(const AccountMapping& account_mapping,
- const UpdateCallback& callback) OVERRIDE;
+ const UpdateCallback& callback) override;
virtual void RemoveAccountMapping(const std::string& account_id,
- const UpdateCallback& callback) OVERRIDE;
+ const UpdateCallback& callback) override;
private:
typedef std::map<std::string, int> AppIdToMessageCountMap;
« no previous file with comments | « google_apis/gcm/engine/fake_connection_handler.h ('k') | google_apis/gcm/engine/mcs_client_unittest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698