Index: sync/api/sync_error.h |
diff --git a/sync/api/sync_error.h b/sync/api/sync_error.h |
index f6ffa87f3132c8c795bb60aeb00e6e81542c26b0..6d91e975671c2c764909dc6fdaa1be8b89b4bb67 100644 |
--- a/sync/api/sync_error.h |
+++ b/sync/api/sync_error.h |
@@ -8,6 +8,7 @@ |
#include <iosfwd> |
#include <string> |
+#include "base/logging.h" |
#include "base/memory/scoped_ptr.h" |
#include "sync/base/sync_export.h" |
#include "sync/internal_api/public/base/model_type.h" |
@@ -38,8 +39,10 @@ class SYNC_EXPORT SyncError { |
// datataype should be associated after a sync update. |
CRYPTO_ERROR, // A cryptographer error was detected, and the |
// datatype should be associated after it is resolved. |
- UNREADY_ERROR, // The type is not ready to start yet, so should be |
+ UNREADY_ERROR, // A datatype is not ready to start yet, so should be |
// neither purged nor enabled until it is ready. |
+ DATATYPE_POLICY_ERROR // A datatype should be disabled and purged due |
+ // to configuration constraints. |
}; |
// Default constructor refers to "no error", and IsSet() will return false. |
@@ -75,6 +78,10 @@ class SYNC_EXPORT SyncError { |
const std::string& message() const; |
ModelType model_type() const; |
ErrorType error_type() const; |
+ // Error severity for logging and UI purposes. |
+ logging::LogSeverity severity() const; |
+ // Type specific message prefix. |
+ std::string type_message_prefix() const; |
// Returns empty string is IsSet() is false. |
std::string ToString() const; |
@@ -96,6 +103,7 @@ class SYNC_EXPORT SyncError { |
// Reset the error to it's default (unset) values. |
void Clear(); |
+ |
Nicolas Zea
2014/07/14 17:36:02
nit: remove extra newline
stanisc
2014/07/15 16:10:01
Done.
|
// scoped_ptr is necessary because Location objects aren't assignable. |
scoped_ptr<tracked_objects::Location> location_; |
std::string message_; |