| 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 #ifndef CHROME_BROWSER_SYNC_PROTOCOL_SYNC_PROTOCOL_ERROR_H_ | 4 #ifndef CHROME_BROWSER_SYNC_PROTOCOL_SYNC_PROTOCOL_ERROR_H_ |
| 5 #define CHROME_BROWSER_SYNC_PROTOCOL_SYNC_PROTOCOL_ERROR_H_ | 5 #define CHROME_BROWSER_SYNC_PROTOCOL_SYNC_PROTOCOL_ERROR_H_ |
| 6 #pragma once | 6 #pragma once |
| 7 | 7 |
| 8 #include <string> | 8 #include <string> |
| 9 | 9 |
| 10 #include "base/values.h" | 10 #include "base/values.h" |
| 11 #include "chrome/browser/sync/syncable/model_type.h" |
| 11 | 12 |
| 12 namespace browser_sync{ | 13 namespace browser_sync{ |
| 13 | 14 |
| 14 enum SyncProtocolErrorType { | 15 enum SyncProtocolErrorType { |
| 15 // Success case. | 16 // Success case. |
| 16 SYNC_SUCCESS, | 17 SYNC_SUCCESS, |
| 17 | 18 |
| 18 // Birthday does not match that of the server. | 19 // Birthday does not match that of the server. |
| 19 NOT_MY_BIRTHDAY, | 20 NOT_MY_BIRTHDAY, |
| 20 | 21 |
| (...skipping 39 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 60 | 61 |
| 61 // The default. No action. | 62 // The default. No action. |
| 62 UNKNOWN_ACTION | 63 UNKNOWN_ACTION |
| 63 }; | 64 }; |
| 64 | 65 |
| 65 struct SyncProtocolError { | 66 struct SyncProtocolError { |
| 66 SyncProtocolErrorType error_type; | 67 SyncProtocolErrorType error_type; |
| 67 std::string error_description; | 68 std::string error_description; |
| 68 std::string url; | 69 std::string url; |
| 69 ClientAction action; | 70 ClientAction action; |
| 71 syncable::ModelTypeSet throttled_types; |
| 70 SyncProtocolError(); | 72 SyncProtocolError(); |
| 71 ~SyncProtocolError(); | 73 ~SyncProtocolError(); |
| 72 DictionaryValue* ToValue() const; | 74 DictionaryValue* ToValue() const; |
| 73 }; | 75 }; |
| 74 | 76 |
| 75 const char* GetSyncErrorTypeString(SyncProtocolErrorType type); | 77 const char* GetSyncErrorTypeString(SyncProtocolErrorType type); |
| 76 const char* GetClientActionString(ClientAction action); | 78 const char* GetClientActionString(ClientAction action); |
| 77 } // namespace browser_sync | 79 } // namespace browser_sync |
| 78 #endif // CHROME_BROWSER_SYNC_PROTOCOL_SYNC_PROTOCOL_ERROR_H_ | 80 #endif // CHROME_BROWSER_SYNC_PROTOCOL_SYNC_PROTOCOL_ERROR_H_ |
| 79 | 81 |
| OLD | NEW |