Index: chrome/browser/sync/glue/bookmark_model_associator.h |
diff --git a/chrome/browser/sync/glue/bookmark_model_associator.h b/chrome/browser/sync/glue/bookmark_model_associator.h |
index 7fd1e5b49a38084a43e3987a8ec9f935c4d2c33e..22820313dd5b0cee8f362eccea7ff27d573c4912 100644 |
--- a/chrome/browser/sync/glue/bookmark_model_associator.h |
+++ b/chrome/browser/sync/glue/bookmark_model_associator.h |
@@ -11,6 +11,7 @@ |
#include <string> |
#include "base/basictypes.h" |
+#include "base/compiler_specific.h" |
#include "base/task.h" |
#include "chrome/browser/sync/unrecoverable_error_handler.h" |
#include "chrome/browser/sync/glue/model_associator.h" |
@@ -48,41 +49,41 @@ class BookmarkModelAssociator |
// node. After successful completion, the models should be identical and |
// corresponding. Returns true on success. On failure of this step, we |
// should abort the sync operation and report an error to the user. |
- virtual bool AssociateModels(SyncError* error); |
+ virtual bool AssociateModels(SyncError* error) OVERRIDE; |
- virtual bool DisassociateModels(SyncError* error); |
+ virtual bool DisassociateModels(SyncError* error) OVERRIDE; |
// The has_nodes out param is true if the sync model has nodes other |
// than the permanent tagged nodes. |
- virtual bool SyncModelHasUserCreatedNodes(bool* has_nodes); |
+ virtual bool SyncModelHasUserCreatedNodes(bool* has_nodes) OVERRIDE; |
// Returns sync id for the given bookmark node id. |
// Returns sync_api::kInvalidId if the sync node is not found for the given |
// bookmark node id. |
- virtual int64 GetSyncIdFromChromeId(const int64& node_id); |
+ virtual int64 GetSyncIdFromChromeId(const int64& node_id) OVERRIDE; |
// Returns the bookmark node for the given sync id. |
// Returns NULL if no bookmark node is found for the given sync id. |
- virtual const BookmarkNode* GetChromeNodeFromSyncId(int64 sync_id); |
+ virtual const BookmarkNode* GetChromeNodeFromSyncId(int64 sync_id) OVERRIDE; |
// Initializes the given sync node from the given bookmark node id. |
// Returns false if no sync node was found for the given bookmark node id or |
// if the initialization of sync node fails. |
virtual bool InitSyncNodeFromChromeId(const int64& node_id, |
- sync_api::BaseNode* sync_node); |
+ sync_api::BaseNode* sync_node) OVERRIDE; |
// Associates the given bookmark node with the given sync id. |
- virtual void Associate(const BookmarkNode* node, int64 sync_id); |
+ virtual void Associate(const BookmarkNode* node, int64 sync_id) OVERRIDE; |
// Remove the association that corresponds to the given sync id. |
- virtual void Disassociate(int64 sync_id); |
+ virtual void Disassociate(int64 sync_id) OVERRIDE; |
- virtual void AbortAssociation() { |
+ virtual void AbortAssociation() OVERRIDE { |
// No implementation needed, this associator runs on the main |
// thread. |
} |
// See ModelAssociator interface. |
- virtual bool CryptoReadyIfNecessary(); |
+ virtual bool CryptoReadyIfNecessary() OVERRIDE; |
protected: |
// Stores the id of the node with the given tag in |sync_id|. |