| Index: chrome/browser/sync/glue/typed_url_model_associator.h
|
| diff --git a/chrome/browser/sync/glue/typed_url_model_associator.h b/chrome/browser/sync/glue/typed_url_model_associator.h
|
| index 90b9f3c19f9d90142f653655f0aa68ac71a1439d..d472e16cb0b6f2ed73e6b840ff9123c013fddcc6 100644
|
| --- a/chrome/browser/sync/glue/typed_url_model_associator.h
|
| +++ b/chrome/browser/sync/glue/typed_url_model_associator.h
|
| @@ -12,6 +12,7 @@
|
| #include <vector>
|
|
|
| #include "base/basictypes.h"
|
| +#include "base/compiler_specific.h"
|
| #include "base/string16.h"
|
| #include "base/task.h"
|
| #include "chrome/browser/history/history_types.h"
|
| @@ -58,36 +59,36 @@ class TypedUrlModelAssociator
|
| // PerDataTypeAssociatorInterface implementation.
|
| //
|
| // Iterates through the sync model looking for matched pairs of items.
|
| - virtual bool AssociateModels(SyncError* error);
|
| + virtual bool AssociateModels(SyncError* error) OVERRIDE;
|
|
|
| // Delete all typed url nodes.
|
| bool DeleteAllNodes(sync_api::WriteTransaction* trans);
|
|
|
| // Clears all associations.
|
| - 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;
|
|
|
| - virtual bool CryptoReadyIfNecessary();
|
| + virtual bool CryptoReadyIfNecessary() OVERRIDE;
|
|
|
| // Not implemented.
|
| - virtual const std::string* GetChromeNodeFromSyncId(int64 sync_id);
|
| + virtual const std::string* GetChromeNodeFromSyncId(int64 sync_id) OVERRIDE;
|
|
|
| // Not implemented.
|
| virtual bool InitSyncNodeFromChromeId(const std::string& node_id,
|
| - sync_api::BaseNode* sync_node);
|
| + sync_api::BaseNode* sync_node) OVERRIDE;
|
|
|
| // Returns the sync id for the given typed_url name, or sync_api::kInvalidId
|
| // if the typed_url name is not associated to any sync id.
|
| - virtual int64 GetSyncIdFromChromeId(const std::string& node_id);
|
| + virtual int64 GetSyncIdFromChromeId(const std::string& node_id) OVERRIDE;
|
|
|
| // Associates the given typed_url name with the given sync id.
|
| - virtual void Associate(const std::string* node, int64 sync_id);
|
| + virtual void Associate(const std::string* 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;
|
|
|
| // Returns whether a node with the given permanent tag was found and update
|
| // |sync_id| with that node's id.
|
|
|