Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(116)

Unified Diff: remoting/protocol/errors.cc

Issue 2026123002: [Chromoting] Use google:remoting namespace to export remoting specific error codes (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Resolve review comments Created 4 years, 7 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
Index: remoting/protocol/errors.cc
diff --git a/remoting/protocol/errors.cc b/remoting/protocol/errors.cc
index 067d919e23df34b5f1d89e44dc1bbbffcefae814..d15d71c4050aa01218f9fd9aa95ef965d90e98f0 100644
--- a/remoting/protocol/errors.cc
+++ b/remoting/protocol/errors.cc
@@ -9,28 +9,30 @@
namespace remoting {
namespace protocol {
+#define MAP_STRING_LITERAL(x) \
Sergey Ulanov 2016/06/02 09:26:03 We don't use define like this for NameMapElement d
Hzj_jie 2016/06/02 22:00:18 Done.
+ { x, #x }
+const NameMapElement<ErrorCode> kErrorCodes[] = {
Sergey Ulanov 2016/06/02 09:26:03 nit: kErrorCodeNames
Hzj_jie 2016/06/02 22:00:18 Done.
+ MAP_STRING_LITERAL(OK),
+ MAP_STRING_LITERAL(PEER_IS_OFFLINE),
+ MAP_STRING_LITERAL(SESSION_REJECTED),
+ MAP_STRING_LITERAL(INCOMPATIBLE_PROTOCOL),
+ MAP_STRING_LITERAL(AUTHENTICATION_FAILED),
+ MAP_STRING_LITERAL(INVALID_ACCOUNT),
+ MAP_STRING_LITERAL(CHANNEL_CONNECTION_ERROR),
+ MAP_STRING_LITERAL(SIGNALING_ERROR),
+ MAP_STRING_LITERAL(SIGNALING_TIMEOUT),
+ MAP_STRING_LITERAL(HOST_OVERLOAD),
+ MAP_STRING_LITERAL(MAX_SESSION_LENGTH),
+ MAP_STRING_LITERAL(HOST_CONFIGURATION_ERROR),
+ MAP_STRING_LITERAL(UNKNOWN_ERROR),
+};
+
#define RETURN_STRING_LITERAL(x) \
Sergey Ulanov 2016/06/02 09:26:03 This define can be removed.
Hzj_jie 2016/06/02 22:00:18 Done.
case x: \
return #x;
const char* ErrorCodeToString(ErrorCode error) {
- switch (error) {
- RETURN_STRING_LITERAL(OK);
- RETURN_STRING_LITERAL(PEER_IS_OFFLINE);
- RETURN_STRING_LITERAL(SESSION_REJECTED);
- RETURN_STRING_LITERAL(INCOMPATIBLE_PROTOCOL);
- RETURN_STRING_LITERAL(AUTHENTICATION_FAILED);
- RETURN_STRING_LITERAL(INVALID_ACCOUNT);
- RETURN_STRING_LITERAL(CHANNEL_CONNECTION_ERROR);
- RETURN_STRING_LITERAL(SIGNALING_ERROR);
- RETURN_STRING_LITERAL(SIGNALING_TIMEOUT);
- RETURN_STRING_LITERAL(HOST_OVERLOAD);
- RETURN_STRING_LITERAL(MAX_SESSION_LENGTH);
- RETURN_STRING_LITERAL(HOST_CONFIGURATION_ERROR);
- RETURN_STRING_LITERAL(UNKNOWN_ERROR);
- }
- NOTREACHED();
- return nullptr;
+ return ValueToName(kErrorCodes, error);
}
} // namespace protocol

Powered by Google App Engine
This is Rietveld 408576698