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

Unified Diff: chrome/browser/extensions/api/socket/socket_api.cc

Issue 10907151: Extensions Docs Server: Enum values do not show up if enum is a type (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 8 years, 3 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: chrome/browser/extensions/api/socket/socket_api.cc
diff --git a/chrome/browser/extensions/api/socket/socket_api.cc b/chrome/browser/extensions/api/socket/socket_api.cc
index ce400e52555c92c8b066844f108681bec9f28690..c4d16378cab317e58005515c1aba7511d3a6dcf0 100644
--- a/chrome/browser/extensions/api/socket/socket_api.cc
+++ b/chrome/browser/extensions/api/socket/socket_api.cc
@@ -28,9 +28,6 @@ const char kBytesWrittenKey[] = "bytesWritten";
const char kDataKey[] = "data";
const char kResultCodeKey[] = "resultCode";
const char kSocketIdKey[] = "socketId";
-const char kTCPOption[] = "tcp";
-const char kUDPOption[] = "udp";
-const char kUnknown[] = "unknown";
const char kSocketNotFoundError[] = "Socket not found";
const char kSocketTypeInvalidError[] = "Socket type is not supported";
@@ -120,14 +117,18 @@ bool SocketCreateFunction::Prepare() {
params_ = api::socket::Create::Params::Create(*args_);
EXTENSION_FUNCTION_VALIDATE(params_.get());
- if (params_->type == kTCPOption) {
- socket_type_ = kSocketTypeTCP;
- } else if (params_->type == kUDPOption) {
- socket_type_ = kSocketTypeUDP;
- } else {
- error_ = kSocketTypeInvalidError;
- return false;
+ switch (params_->type) {
+ case extensions::api::socket::SOCKET_SOCKET_TYPE_TCP:
+ socket_type_ = kSocketTypeTCP;
+ break;
+ case extensions::api::socket::SOCKET_SOCKET_TYPE_UDP:
+ socket_type_ = kSocketTypeUDP;
+ break;
+ case extensions::api::socket::SOCKET_SOCKET_TYPE_NONE:
+ NOTREACHED();
+ break;
}
+
if (params_->options.get()) {
scoped_ptr<DictionaryValue> options = params_->options->ToValue();
src_id_ = ExtractSrcId(options.get());
@@ -534,18 +535,10 @@ void SocketGetInfoFunction::Work() {
if (socket) {
// This represents what we know about the socket, and does not call through
// to the system.
- switch (socket->GetSocketType()) {
- case Socket::TYPE_TCP:
- info.socket_type = kTCPOption;
- break;
- case Socket::TYPE_UDP:
- info.socket_type = kUDPOption;
- break;
- default:
- NOTREACHED() << "Unknown socket type.";
- info.socket_type = kUnknown;
- break;
- }
+ if (socket->GetSocketType() == Socket::TYPE_TCP)
+ info.socket_type = extensions::api::socket::SOCKET_SOCKET_TYPE_TCP;
+ else
+ info.socket_type = extensions::api::socket::SOCKET_SOCKET_TYPE_UDP;
info.connected = socket->IsConnected();
// Grab the peer address as known by the OS. This and the call below will

Powered by Google App Engine
This is Rietveld 408576698