| OLD | NEW |
| 1 // Copyright (c) 2011 The Chromium Authors. All rights reserved. | 1 // Copyright (c) 2011 The Chromium Authors. All rights reserved. |
| 2 // Use of this source code is governed by a BSD-style license that can be | 2 // Use of this source code is governed by a BSD-style license that can be |
| 3 // found in the LICENSE file. | 3 // found in the LICENSE file. |
| 4 | 4 |
| 5 #include "chrome/browser/sync/protocol/sync_protocol_error.h" | 5 #include "chrome/browser/sync/protocol/sync_protocol_error.h" |
| 6 | 6 |
| 7 #include <string> | 7 #include <string> |
| 8 | 8 |
| 9 #include "base/logging.h" | 9 #include "base/logging.h" |
| 10 #include "base/values.h" | 10 #include "base/values.h" |
| 11 | 11 |
| 12 namespace browser_sync { | 12 namespace browser_sync { |
| 13 #define ENUM_CASE(x) case x: return #x; break; | 13 #define ENUM_CASE(x) case x: return #x; break; |
| 14 | 14 |
| 15 const char* GetSyncErrorTypeString(SyncProtocolErrorType type) { | 15 const char* GetSyncErrorTypeString(SyncOperationResultType type) { |
| 16 switch (type) { | 16 switch (type) { |
| 17 ENUM_CASE(SYNC_SUCCESS); | 17 ENUM_CASE(OPERATION_SUCCESS); |
| 18 ENUM_CASE(DIRECTORY_LOOKUP_FAILED); |
| 19 ENUM_CASE(NETWORK_CONNECTION_UNAVAILABLE); |
| 20 ENUM_CASE(NETWORK_IO_ERROR); |
| 21 ENUM_CASE(SYNC_SERVER_ERROR); |
| 22 ENUM_CASE(SYNC_AUTH_ERROR); |
| 18 ENUM_CASE(NOT_MY_BIRTHDAY); | 23 ENUM_CASE(NOT_MY_BIRTHDAY); |
| 19 ENUM_CASE(THROTTLED); | 24 ENUM_CASE(THROTTLED); |
| 20 ENUM_CASE(CLEAR_PENDING); | 25 ENUM_CASE(CLEAR_PENDING); |
| 21 ENUM_CASE(TRANSIENT_ERROR); | 26 ENUM_CASE(TRANSIENT_ERROR); |
| 22 ENUM_CASE(NON_RETRIABLE_ERROR); | 27 ENUM_CASE(NON_RETRIABLE_ERROR); |
| 23 ENUM_CASE(MIGRATION_DONE); | 28 ENUM_CASE(MIGRATION_DONE); |
| 24 ENUM_CASE(INVALID_CREDENTIAL); | 29 ENUM_CASE(INVALID_CREDENTIAL); |
| 30 ENUM_CASE(INVALID); |
| 25 ENUM_CASE(UNKNOWN_ERROR); | 31 ENUM_CASE(UNKNOWN_ERROR); |
| 26 } | 32 } |
| 27 NOTREACHED(); | 33 NOTREACHED(); |
| 28 return ""; | 34 return ""; |
| 29 } | 35 } |
| 30 | 36 |
| 31 const char* GetClientActionString(ClientAction action) { | 37 const char* GetClientActionString(ClientAction action) { |
| 32 switch (action) { | 38 switch (action) { |
| 33 ENUM_CASE(UPGRADE_CLIENT); | 39 ENUM_CASE(UPGRADE_CLIENT); |
| 34 ENUM_CASE(CLEAR_USER_DATA_AND_RESYNC); | 40 ENUM_CASE(CLEAR_USER_DATA_AND_RESYNC); |
| 35 ENUM_CASE(ENABLE_SYNC_ON_ACCOUNT); | 41 ENUM_CASE(ENABLE_SYNC_ON_ACCOUNT); |
| 36 ENUM_CASE(STOP_AND_RESTART_SYNC); | 42 ENUM_CASE(STOP_AND_RESTART_SYNC); |
| 37 ENUM_CASE(DISABLE_SYNC_ON_CLIENT); | 43 ENUM_CASE(DISABLE_SYNC_ON_CLIENT); |
| 38 ENUM_CASE(UNKNOWN_ACTION); | 44 ENUM_CASE(UNKNOWN_ACTION); |
| 39 } | 45 } |
| 40 NOTREACHED(); | 46 NOTREACHED(); |
| 41 return ""; | 47 return ""; |
| 42 } | 48 } |
| 43 | 49 |
| 44 SyncProtocolError::SyncProtocolError() | 50 SyncOperationResult::SyncOperationResult() |
| 45 : error_type(UNKNOWN_ERROR), | 51 : error_type(INVALID), |
| 46 action(UNKNOWN_ACTION) { | 52 action(UNKNOWN_ACTION) { |
| 47 } | 53 } |
| 48 | 54 |
| 49 SyncProtocolError::~SyncProtocolError() { | 55 SyncOperationResult::~SyncOperationResult() { |
| 50 } | 56 } |
| 51 | 57 |
| 52 DictionaryValue* SyncProtocolError::ToValue() const { | 58 DictionaryValue* SyncOperationResult::ToValue() const { |
| 53 DictionaryValue* value = new DictionaryValue(); | 59 DictionaryValue* value = new DictionaryValue(); |
| 54 value->SetString("ErrorType", | 60 value->SetString("ErrorType", |
| 55 GetSyncErrorTypeString(error_type)); | 61 GetSyncErrorTypeString(error_type)); |
| 56 value->SetString("ErrorDescription", error_description); | 62 value->SetString("ErrorDescription", error_description); |
| 57 value->SetString("url", url); | 63 value->SetString("url", url); |
| 58 value->SetString("action", GetClientActionString(action)); | 64 value->SetString("action", GetClientActionString(action)); |
| 59 return value; | 65 return value; |
| 60 } | 66 } |
| 61 | 67 |
| 62 } // namespace browser_sync | 68 } // namespace browser_sync |
| 63 | 69 |
| OLD | NEW |