| Index: chrome/browser/sync/protocol/sync_protocol_error.h
|
| diff --git a/chrome/browser/sync/protocol/sync_protocol_error.h b/chrome/browser/sync/protocol/sync_protocol_error.h
|
| index 0544aa00aa185264681fad2ed118ff8ab4ac3d4f..13d1a9482137dfad47dbfb4e9e00249842e0c54e 100644
|
| --- a/chrome/browser/sync/protocol/sync_protocol_error.h
|
| +++ b/chrome/browser/sync/protocol/sync_protocol_error.h
|
| @@ -11,9 +11,20 @@
|
|
|
| namespace browser_sync{
|
|
|
| -enum SyncProtocolErrorType {
|
| +enum SyncOperationResultType {
|
| // Success case.
|
| - SYNC_SUCCESS,
|
| + OPERATION_SUCCESS,
|
| +
|
| + DIRECTORY_LOOKUP_FAILED,
|
| +
|
| + NETWORK_CONNECTION_UNAVAILABLE,
|
| +
|
| + NETWORK_IO_ERROR,
|
| +
|
| + // FIXME: what are these two for?
|
| + SYNC_SERVER_ERROR,
|
| +
|
| + SYNC_AUTH_ERROR,
|
|
|
| // Birthday does not match that of the server.
|
| NOT_MY_BIRTHDAY,
|
| @@ -39,6 +50,9 @@ enum SyncProtocolErrorType {
|
| INVALID_CREDENTIAL,
|
|
|
| // The default value.
|
| + INVALID,
|
| +
|
| + // Value used when we do not understand the server's response.
|
| UNKNOWN_ERROR
|
| };
|
|
|
| @@ -62,17 +76,17 @@ enum ClientAction {
|
| UNKNOWN_ACTION
|
| };
|
|
|
| -struct SyncProtocolError {
|
| - SyncProtocolErrorType error_type;
|
| +struct SyncOperationResult {
|
| + SyncOperationResultType error_type;
|
| std::string error_description;
|
| std::string url;
|
| ClientAction action;
|
| - SyncProtocolError();
|
| - ~SyncProtocolError();
|
| + SyncOperationResult();
|
| + ~SyncOperationResult();
|
| DictionaryValue* ToValue() const;
|
| };
|
|
|
| -const char* GetSyncErrorTypeString(SyncProtocolErrorType type);
|
| +const char* GetSyncErrorTypeString(SyncOperationResultType type);
|
| const char* GetClientActionString(ClientAction action);
|
| } // namespace browser_sync
|
| #endif // CHROME_BROWSER_SYNC_PROTOCOL_SYNC_PROTOCOL_ERROR_H_
|
|
|