Skip to content

GitLab

T
tangled
Commit b48f7f75 authored by penghuang@chromium.org's avatar penghuang@chromium.org
Browse files
Options

Move socket API from experimental to dev channel and remove some dead code. 


BUG=130379
TEST=browser_tests --gtest_filter=SocketApiTest.*

Review URL: https://chromiumcodereview.appspot.com/10440097

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@148819 0039d316-1c4b-4281-b951-d872f2087c98
parent 8c31bf56
Hide whitespace changes
Inline Side-by-side
Showing with 198 additions and 194 deletions
chrome/browser/extensions/api/api_resource_event_notifier.cc
View file @ b48f7f75
...@@ -14,7 +14,6 @@ ...@@ -14,7 +14,6 @@
using content::BrowserThread; using content::BrowserThread;
namespace events { namespace events {
const char kExperimentalSocketOnEvent[] = "experimental.socket.onEvent";
const char kExperimentalUsbOnEvent[] = "experimental.usb.onEvent"; const char kExperimentalUsbOnEvent[] = "experimental.usb.onEvent";
}; };
...@@ -50,38 +49,6 @@ ApiResourceEventNotifier::ApiResourceEventNotifier( ...@@ -50,38 +49,6 @@ ApiResourceEventNotifier::ApiResourceEventNotifier(
src_url_(src_url) { src_url_(src_url) {
} }
void ApiResourceEventNotifier::OnConnectComplete(int result_code) {
SendEventWithResultCode(events::kExperimentalSocketOnEvent,
API_RESOURCE_EVENT_CONNECT_COMPLETE, result_code);
}
void ApiResourceEventNotifier::OnDataRead(int result_code,
base::ListValue* data,
const std::string& address,
int port) {
// Do we have a destination for this event? There will be one if a source id
// was injected by the request handler for the resource's create method in
// schema_generated_bindings.js, which will in turn be the case if the caller
// of the create method provided an onEvent closure.
if (src_id_ < 0) {
delete data;
return;
}
DictionaryValue* event = CreateApiResourceEvent(
API_RESOURCE_EVENT_DATA_READ);
event->SetInteger(kResultCodeKey, result_code);
event->Set(kDataKey, data);
event->SetString(kAddressKey, address);
event->SetInteger(kPortKey, port);
DispatchEvent(events::kExperimentalSocketOnEvent, event);
}
void ApiResourceEventNotifier::OnWriteComplete(int result_code) {
SendEventWithResultCode(events::kExperimentalSocketOnEvent,
API_RESOURCE_EVENT_WRITE_COMPLETE, result_code);
}
void ApiResourceEventNotifier::OnTransferComplete(UsbTransferStatus status, void ApiResourceEventNotifier::OnTransferComplete(UsbTransferStatus status,
const std::string& error, const std::string& error,
base::BinaryValue* data) { base::BinaryValue* data) {
...@@ -105,12 +72,6 @@ void ApiResourceEventNotifier::OnTransferComplete(UsbTransferStatus status, ...@@ -105,12 +72,6 @@ void ApiResourceEventNotifier::OnTransferComplete(UsbTransferStatus status,
std::string ApiResourceEventNotifier::ApiResourceEventTypeToString( std::string ApiResourceEventNotifier::ApiResourceEventTypeToString(
ApiResourceEventType event_type) { ApiResourceEventType event_type) {
switch (event_type) { switch (event_type) {
case API_RESOURCE_EVENT_CONNECT_COMPLETE:
return kEventTypeConnectComplete;
case API_RESOURCE_EVENT_DATA_READ:
return kEventTypeDataRead;
case API_RESOURCE_EVENT_WRITE_COMPLETE:
return kEventTypeWriteComplete;
case API_RESOURCE_EVENT_TRANSFER_COMPLETE: case API_RESOURCE_EVENT_TRANSFER_COMPLETE:
return kEventTypeTransferComplete; return kEventTypeTransferComplete;
} }
......
chrome/browser/extensions/api/api_resource_event_notifier.h
View file @ b48f7f75
...@@ -23,9 +23,6 @@ namespace extensions { ...@@ -23,9 +23,6 @@ namespace extensions {
class EventRouter; class EventRouter;
enum ApiResourceEventType { enum ApiResourceEventType {
API_RESOURCE_EVENT_CONNECT_COMPLETE,
API_RESOURCE_EVENT_DATA_READ,
API_RESOURCE_EVENT_WRITE_COMPLETE,
API_RESOURCE_EVENT_TRANSFER_COMPLETE, API_RESOURCE_EVENT_TRANSFER_COMPLETE,
}; };
...@@ -41,16 +38,6 @@ class ApiResourceEventNotifier ...@@ -41,16 +38,6 @@ class ApiResourceEventNotifier
const std::string& src_extension_id, int src_id, const std::string& src_extension_id, int src_id,
const GURL& src_url); const GURL& src_url);
virtual void OnConnectComplete(int result_code);
// Takes ownership of data.
virtual void OnDataRead(int result_code,
base::ListValue* data,
const std::string& address,
int port);
virtual void OnWriteComplete(int result_code);
virtual void OnTransferComplete(UsbTransferStatus status, virtual void OnTransferComplete(UsbTransferStatus status,
const std::string& error, const std::string& error,
base::BinaryValue* data); base::BinaryValue* data);
......
chrome/browser/extensions/api/socket/socket_api.cc
View file @ b48f7f75
...@@ -100,7 +100,7 @@ SocketCreateFunction::SocketCreateFunction() ...@@ -100,7 +100,7 @@ SocketCreateFunction::SocketCreateFunction()
SocketCreateFunction::~SocketCreateFunction() {} SocketCreateFunction::~SocketCreateFunction() {}
bool SocketCreateFunction::Prepare() { bool SocketCreateFunction::Prepare() {
params_ = api::experimental_socket::Create::Params::Create(*args_); params_ = api::socket::Create::Params::Create(*args_);
EXTENSION_FUNCTION_VALIDATE(params_.get()); EXTENSION_FUNCTION_VALIDATE(params_.get());
if (params_->type == kTCPOption) { if (params_->type == kTCPOption) {
...@@ -227,7 +227,7 @@ SocketReadFunction::SocketReadFunction() ...@@ -227,7 +227,7 @@ SocketReadFunction::SocketReadFunction()
SocketReadFunction::~SocketReadFunction() {} SocketReadFunction::~SocketReadFunction() {}
bool SocketReadFunction::Prepare() { bool SocketReadFunction::Prepare() {
params_ = api::experimental_socket::Read::Params::Create(*args_); params_ = api::socket::Read::Params::Create(*args_);
EXTENSION_FUNCTION_VALIDATE(params_.get()); EXTENSION_FUNCTION_VALIDATE(params_.get());
return true; return true;
} }
...@@ -308,7 +308,7 @@ SocketRecvFromFunction::SocketRecvFromFunction() ...@@ -308,7 +308,7 @@ SocketRecvFromFunction::SocketRecvFromFunction()
SocketRecvFromFunction::~SocketRecvFromFunction() {} SocketRecvFromFunction::~SocketRecvFromFunction() {}
bool SocketRecvFromFunction::Prepare() { bool SocketRecvFromFunction::Prepare() {
params_ = api::experimental_socket::RecvFrom::Params::Create(*args_); params_ = api::socket::RecvFrom::Params::Create(*args_);
EXTENSION_FUNCTION_VALIDATE(params_.get()); EXTENSION_FUNCTION_VALIDATE(params_.get());
return true; return true;
} }
...@@ -408,7 +408,7 @@ SocketSetKeepAliveFunction::SocketSetKeepAliveFunction() ...@@ -408,7 +408,7 @@ SocketSetKeepAliveFunction::SocketSetKeepAliveFunction()
SocketSetKeepAliveFunction::~SocketSetKeepAliveFunction() {} SocketSetKeepAliveFunction::~SocketSetKeepAliveFunction() {}
bool SocketSetKeepAliveFunction::Prepare() { bool SocketSetKeepAliveFunction::Prepare() {
params_ = api::experimental_socket::SetKeepAlive::Params::Create(*args_); params_ = api::socket::SetKeepAlive::Params::Create(*args_);
EXTENSION_FUNCTION_VALIDATE(params_.get()); EXTENSION_FUNCTION_VALIDATE(params_.get());
return true; return true;
} }
...@@ -434,7 +434,7 @@ SocketSetNoDelayFunction::SocketSetNoDelayFunction() ...@@ -434,7 +434,7 @@ SocketSetNoDelayFunction::SocketSetNoDelayFunction()
SocketSetNoDelayFunction::~SocketSetNoDelayFunction() {} SocketSetNoDelayFunction::~SocketSetNoDelayFunction() {}
bool SocketSetNoDelayFunction::Prepare() { bool SocketSetNoDelayFunction::Prepare() {
params_ = api::experimental_socket::SetNoDelay::Params::Create(*args_); params_ = api::socket::SetNoDelay::Params::Create(*args_);
EXTENSION_FUNCTION_VALIDATE(params_.get()); EXTENSION_FUNCTION_VALIDATE(params_.get());
return true; return true;
} }
......
chrome/browser/extensions/api/socket/socket_api.h
View file @ b48f7f75
...@@ -8,7 +8,7 @@ ...@@ -8,7 +8,7 @@
#include "base/memory/ref_counted.h" #include "base/memory/ref_counted.h"
#include "chrome/browser/extensions/api/api_function.h" #include "chrome/browser/extensions/api/api_function.h"
#include "chrome/browser/extensions/api/api_resource_manager.h" #include "chrome/browser/extensions/api/api_resource_manager.h"
#include "chrome/common/extensions/api/experimental_socket.h" #include "chrome/common/extensions/api/socket.h"
#include "net/base/address_list.h" #include "net/base/address_list.h"
#include "net/base/host_resolver.h" #include "net/base/host_resolver.h"
...@@ -63,7 +63,7 @@ class SocketExtensionWithDnsLookupFunction : public SocketAsyncApiFunction { ...@@ -63,7 +63,7 @@ class SocketExtensionWithDnsLookupFunction : public SocketAsyncApiFunction {
class SocketCreateFunction : public SocketAsyncApiFunction { class SocketCreateFunction : public SocketAsyncApiFunction {
public: public:
DECLARE_EXTENSION_FUNCTION_NAME("experimental.socket.create") DECLARE_EXTENSION_FUNCTION_NAME("socket.create")
SocketCreateFunction(); SocketCreateFunction();
...@@ -81,7 +81,7 @@ class SocketCreateFunction : public SocketAsyncApiFunction { ...@@ -81,7 +81,7 @@ class SocketCreateFunction : public SocketAsyncApiFunction {
kSocketTypeUDP kSocketTypeUDP
}; };
scoped_ptr<api::experimental_socket::Create::Params> params_; scoped_ptr<api::socket::Create::Params> params_;
SocketType socket_type_; SocketType socket_type_;
int src_id_; int src_id_;
ApiResourceEventNotifier* event_notifier_; ApiResourceEventNotifier* event_notifier_;
...@@ -89,7 +89,7 @@ class SocketCreateFunction : public SocketAsyncApiFunction { ...@@ -89,7 +89,7 @@ class SocketCreateFunction : public SocketAsyncApiFunction {
class SocketDestroyFunction : public SocketAsyncApiFunction { class SocketDestroyFunction : public SocketAsyncApiFunction {
public: public:
DECLARE_EXTENSION_FUNCTION_NAME("experimental.socket.destroy") DECLARE_EXTENSION_FUNCTION_NAME("socket.destroy")
protected: protected:
virtual ~SocketDestroyFunction() {} virtual ~SocketDestroyFunction() {}
...@@ -104,7 +104,7 @@ class SocketDestroyFunction : public SocketAsyncApiFunction { ...@@ -104,7 +104,7 @@ class SocketDestroyFunction : public SocketAsyncApiFunction {
class SocketConnectFunction : public SocketExtensionWithDnsLookupFunction { class SocketConnectFunction : public SocketExtensionWithDnsLookupFunction {
public: public:
DECLARE_EXTENSION_FUNCTION_NAME("experimental.socket.connect") DECLARE_EXTENSION_FUNCTION_NAME("socket.connect")
SocketConnectFunction(); SocketConnectFunction();
...@@ -129,7 +129,7 @@ class SocketConnectFunction : public SocketExtensionWithDnsLookupFunction { ...@@ -129,7 +129,7 @@ class SocketConnectFunction : public SocketExtensionWithDnsLookupFunction {
class SocketDisconnectFunction : public SocketAsyncApiFunction { class SocketDisconnectFunction : public SocketAsyncApiFunction {
public: public:
DECLARE_EXTENSION_FUNCTION_NAME("experimental.socket.disconnect") DECLARE_EXTENSION_FUNCTION_NAME("socket.disconnect")
protected: protected:
virtual ~SocketDisconnectFunction() {} virtual ~SocketDisconnectFunction() {}
...@@ -144,7 +144,7 @@ class SocketDisconnectFunction : public SocketAsyncApiFunction { ...@@ -144,7 +144,7 @@ class SocketDisconnectFunction : public SocketAsyncApiFunction {
class SocketBindFunction : public SocketAsyncApiFunction { class SocketBindFunction : public SocketAsyncApiFunction {
public: public:
DECLARE_EXTENSION_FUNCTION_NAME("experimental.socket.bind") DECLARE_EXTENSION_FUNCTION_NAME("socket.bind")
protected: protected:
virtual ~SocketBindFunction() {} virtual ~SocketBindFunction() {}
...@@ -161,7 +161,7 @@ class SocketBindFunction : public SocketAsyncApiFunction { ...@@ -161,7 +161,7 @@ class SocketBindFunction : public SocketAsyncApiFunction {
class SocketReadFunction : public SocketAsyncApiFunction { class SocketReadFunction : public SocketAsyncApiFunction {
public: public:
DECLARE_EXTENSION_FUNCTION_NAME("experimental.socket.read") DECLARE_EXTENSION_FUNCTION_NAME("socket.read")
SocketReadFunction(); SocketReadFunction();
...@@ -174,12 +174,12 @@ class SocketReadFunction : public SocketAsyncApiFunction { ...@@ -174,12 +174,12 @@ class SocketReadFunction : public SocketAsyncApiFunction {
void OnCompleted(int result, scoped_refptr<net::IOBuffer> io_buffer); void OnCompleted(int result, scoped_refptr<net::IOBuffer> io_buffer);
private: private:
scoped_ptr<api::experimental_socket::Read::Params> params_; scoped_ptr<api::socket::Read::Params> params_;
}; };
class SocketWriteFunction : public SocketAsyncApiFunction { class SocketWriteFunction : public SocketAsyncApiFunction {
public: public:
DECLARE_EXTENSION_FUNCTION_NAME("experimental.socket.write") DECLARE_EXTENSION_FUNCTION_NAME("socket.write")
SocketWriteFunction(); SocketWriteFunction();
...@@ -199,7 +199,7 @@ class SocketWriteFunction : public SocketAsyncApiFunction { ...@@ -199,7 +199,7 @@ class SocketWriteFunction : public SocketAsyncApiFunction {
class SocketRecvFromFunction : public SocketAsyncApiFunction { class SocketRecvFromFunction : public SocketAsyncApiFunction {
public: public:
DECLARE_EXTENSION_FUNCTION_NAME("experimental.socket.recvFrom") DECLARE_EXTENSION_FUNCTION_NAME("socket.recvFrom")
SocketRecvFromFunction(); SocketRecvFromFunction();
...@@ -215,12 +215,12 @@ class SocketRecvFromFunction : public SocketAsyncApiFunction { ...@@ -215,12 +215,12 @@ class SocketRecvFromFunction : public SocketAsyncApiFunction {
int port); int port);
private: private:
scoped_ptr<api::experimental_socket::RecvFrom::Params> params_; scoped_ptr<api::socket::RecvFrom::Params> params_;
}; };
class SocketSendToFunction : public SocketExtensionWithDnsLookupFunction { class SocketSendToFunction : public SocketExtensionWithDnsLookupFunction {
public: public:
DECLARE_EXTENSION_FUNCTION_NAME("experimental.socket.sendTo") DECLARE_EXTENSION_FUNCTION_NAME("socket.sendTo")
SocketSendToFunction(); SocketSendToFunction();
...@@ -247,7 +247,7 @@ class SocketSendToFunction : public SocketExtensionWithDnsLookupFunction { ...@@ -247,7 +247,7 @@ class SocketSendToFunction : public SocketExtensionWithDnsLookupFunction {
class SocketSetKeepAliveFunction : public SocketAsyncApiFunction { class SocketSetKeepAliveFunction : public SocketAsyncApiFunction {
public: public:
DECLARE_EXTENSION_FUNCTION_NAME("experimental.socket.setKeepAlive") DECLARE_EXTENSION_FUNCTION_NAME("socket.setKeepAlive")
SocketSetKeepAliveFunction(); SocketSetKeepAliveFunction();
...@@ -259,12 +259,12 @@ class SocketSetKeepAliveFunction : public SocketAsyncApiFunction { ...@@ -259,12 +259,12 @@ class SocketSetKeepAliveFunction : public SocketAsyncApiFunction {
virtual void Work() OVERRIDE; virtual void Work() OVERRIDE;
private: private:
scoped_ptr<api::experimental_socket::SetKeepAlive::Params> params_; scoped_ptr<api::socket::SetKeepAlive::Params> params_;
}; };
class SocketSetNoDelayFunction : public SocketAsyncApiFunction { class SocketSetNoDelayFunction : public SocketAsyncApiFunction {
public: public:
DECLARE_EXTENSION_FUNCTION_NAME("experimental.socket.setNoDelay") DECLARE_EXTENSION_FUNCTION_NAME("socket.setNoDelay")
SocketSetNoDelayFunction(); SocketSetNoDelayFunction();
...@@ -276,7 +276,7 @@ class SocketSetNoDelayFunction : public SocketAsyncApiFunction { ...@@ -276,7 +276,7 @@ class SocketSetNoDelayFunction : public SocketAsyncApiFunction {
virtual void Work() OVERRIDE; virtual void Work() OVERRIDE;
private: private:
scoped_ptr<api::experimental_socket::SetNoDelay::Params> params_; scoped_ptr<api::socket::SetNoDelay::Params> params_;
}; };
} // namespace extensions } // namespace extensions
......
chrome/common/extensions/api/_permission_features.json
View file @ b48f7f75
...@@ -240,7 +240,7 @@ ...@@ -240,7 +240,7 @@
"extension_types": ["platform_app"] "extension_types": ["platform_app"]
}, },
"socket": { "socket": {
"channel": "stable", "channel": "dev",
"extension_types": ["platform_app"] "extension_types": ["platform_app"]
}, },
"storage": { "storage": {
......
chrome/common/extensions/api/api.gyp
View file @ b48f7f75
...@@ -43,10 +43,10 @@ ...@@ -43,10 +43,10 @@
'experimental_idltest.idl', 'experimental_idltest.idl',
'experimental_media_galleries.idl', 'experimental_media_galleries.idl',
'experimental_serial.idl', 'experimental_serial.idl',
'experimental_socket.idl',
'experimental_usb.idl', 'experimental_usb.idl',
'file_system.idl', 'file_system.idl',
'media_galleries.idl', 'media_galleries.idl',
'socket.idl',
], ],
'cc_dir': 'chrome/common/extensions/api', 'cc_dir': 'chrome/common/extensions/api',
'root_namespace': 'extensions::api', 'root_namespace': 'extensions::api',
......
chrome/common/extensions/api/experimental_socket.idl → chrome/common/extensions/api/socket.idl
View file @ b48f7f75
...@@ -4,7 +4,7 @@ ...@@ -4,7 +4,7 @@
// File-level comment to appease parser. Eventually this will not be necessary. // File-level comment to appease parser. Eventually this will not be necessary.
namespace experimental.socket { namespace socket {
enum SocketType { enum SocketType {
tcp, tcp,
udp udp
...@@ -12,9 +12,6 @@ namespace experimental.socket { ...@@ -12,9 +12,6 @@ namespace experimental.socket {
// The socket options. // The socket options.
dictionary CreateOptions { dictionary CreateOptions {
// The schema generator does not support dictionaries without any fields.
// Ignore this field.
[nodoc] long? dummyValue;
}; };
dictionary CreateInfo { dictionary CreateInfo {
......
chrome/common/extensions/docs/apps/api_index.html
View file @ b48f7f75
...@@ -208,6 +208,7 @@ Here are the supported chrome.* APIs: ...@@ -208,6 +208,7 @@ Here are the supported chrome.* APIs:
</li><li><a href="mediaGalleries.html" js="">mediaGalleries</a> </li><li><a href="mediaGalleries.html" js="">mediaGalleries</a>
</li><li><a href="permissions.html" js="">permissions</a> </li><li><a href="permissions.html" js="">permissions</a>
</li><li><a href="runtime.html" js="">runtime</a> </li><li><a href="runtime.html" js="">runtime</a>
</li><li><a href="socket.html" js="">socket</a>
</li><li><a href="storage.html" js="">storage</a> </li><li><a href="storage.html" js="">storage</a>
</li><li><a href="tts.html" js="">tts</a> </li><li><a href="tts.html" js="">tts</a>
</li><li><a href="types.html" js="">types</a> </li><li><a href="types.html" js="">types</a>
......
chrome/common/extensions/docs/apps/experimental.html
View file @ b48f7f75
...@@ -216,7 +216,6 @@ on the following experimental APIs: ...@@ -216,7 +216,6 @@ on the following experimental APIs:
<a href="experimental.identity.html">experimental.identity</a></li><li> <a href="experimental.identity.html">experimental.identity</a></li><li>
<a href="experimental.mediaGalleries.html">experimental.mediaGalleries</a></li><li> <a href="experimental.mediaGalleries.html">experimental.mediaGalleries</a></li><li>
<a href="experimental.serial.html">experimental.serial</a></li><li> <a href="experimental.serial.html">experimental.serial</a></li><li>
<a href="experimental.socket.html">experimental.socket</a></li><li>
<a href="experimental.usb.html">experimental.usb</a></li> <a href="experimental.usb.html">experimental.usb</a></li>
</ul> </ul>
<p class="doc-family extensions"> <p class="doc-family extensions">
......
chrome/common/extensions/docs/apps/experimental.socket.html → chrome/common/extensions/docs/apps/socket.html
View file @ b48f7f75
...@@ -17,7 +17,7 @@ ...@@ -17,7 +17,7 @@
<script type="text/javascript" src="../js/api_page_generator.js"></script> <script type="text/javascript" src="../js/api_page_generator.js"></script>
<script type="text/javascript" src="../js/bootstrap.js"></script> <script type="text/javascript" src="../js/bootstrap.js"></script>
<script type="text/javascript" src="../js/sidebar.js"></script> <script type="text/javascript" src="../js/sidebar.js"></script>
<meta name="description" content="Documentation for the chrome.experimental.socket module, which is part of the Google Chrome extension APIs."><title>chrome.experimental.socket - Google Chrome Extensions - Google Code</title></head> <meta name="description" content="Documentation for the chrome.socket module, which is part of the Google Chrome extension APIs."><title>chrome.socket - Google Chrome Extensions - Google Code</title></head>
<body doc-family="apps"> <link href="../css/ApiRefStyles_apps.css" rel="stylesheet" type="text/css"> <body doc-family="apps"> <link href="../css/ApiRefStyles_apps.css" rel="stylesheet" type="text/css">
<link href="../css/prettify.css" rel="stylesheet" type="text/css"> <link href="../css/prettify.css" rel="stylesheet" type="text/css">
<link href="../css/shared.css" rel="stylesheet" type="text/css"> <link href="../css/shared.css" rel="stylesheet" type="text/css">
...@@ -157,14 +157,14 @@ ...@@ -157,14 +157,14 @@
</script> </script>
<div class="g-unit" id="gc-pagecontent"> <div class="g-unit" id="gc-pagecontent">
<div id="pageTitle"> <div id="pageTitle">
<h1 class="page_title">chrome.experimental.socket</h1> <h1 class="page_title">chrome.socket</h1>
</div> </div>
<!-- TABLE OF CONTENTS --> <!-- TABLE OF CONTENTS -->
<div id="toc"> <div id="toc">
<h2>Contents</h2> <h2>Contents</h2>
<ol> <ol>
<li> <li>
<a href="#apiReference">API reference: chrome.experimental.socket</a> <a href="#apiReference">API reference: chrome.socket</a>
<ol> <ol>
<li> <li>
<a href="#global-methods">Methods</a> <a href="#global-methods">Methods</a>
...@@ -198,27 +198,27 @@ ...@@ -198,27 +198,27 @@
<a href="#types">Types</a> <a href="#types">Types</a>
<ol> <ol>
<li> <li>
<a href="#type-experimental.socket.SocketType">experimental.socket.SocketType</a> <a href="#type-socket.SocketType">socket.SocketType</a>
<ol> <ol>
</ol> </ol>
</li><li> </li><li>
<a href="#type-experimental.socket.CreateOptions">experimental.socket.CreateOptions</a> <a href="#type-socket.CreateOptions">socket.CreateOptions</a>
<ol> <ol>
</ol> </ol>
</li><li> </li><li>
<a href="#type-experimental.socket.CreateInfo">experimental.socket.CreateInfo</a> <a href="#type-socket.CreateInfo">socket.CreateInfo</a>
<ol> <ol>
</ol> </ol>
</li><li> </li><li>
<a href="#type-experimental.socket.ReadInfo">experimental.socket.ReadInfo</a> <a href="#type-socket.ReadInfo">socket.ReadInfo</a>
<ol> <ol>
</ol> </ol>
</li><li> </li><li>
<a href="#type-experimental.socket.WriteInfo">experimental.socket.WriteInfo</a> <a href="#type-socket.WriteInfo">socket.WriteInfo</a>
<ol> <ol>
</ol> </ol>
</li><li> </li><li>
<a href="#type-experimental.socket.RecvFromInfo">experimental.socket.RecvFromInfo</a> <a href="#type-socket.RecvFromInfo">socket.RecvFromInfo</a>
<ol> <ol>
</ol> </ol>
</li> </li>
...@@ -230,15 +230,23 @@ ...@@ -230,15 +230,23 @@
</div> </div>
<!-- /TABLE OF CONTENTS --> <!-- /TABLE OF CONTENTS -->
<!-- Standard content lead-in for experimental API pages --> <!-- Standard content lead-in for experimental API pages -->
<p id="classSummary"> <p class="warning">
For information on how to use experimental APIs, see the <a href="experimental.html">chrome.experimental.* APIs</a> page. <!-- Standard content lead-in for APIs that are not yet available on
the stable channel. -->
<em>Warning:</em> This API is still under development. It is only
available for Chrome users on the
<span>
<strong>dev</strong>
<a href="http://www.chromium.org/getting-involved/dev-channel">early
release channel</a>.</span>
<a href="TODO">Learn more</a>.
</p> </p>
<!-- STATIC CONTENT PLACEHOLDER --> <!-- STATIC CONTENT PLACEHOLDER -->
<div id="static"></div> <div id="static"></div>
<!-- API PAGE --> <!-- API PAGE -->
<div class="apiPage"> <div class="apiPage">
<a name="apiReference"></a> <a name="apiReference"></a>
<h2>API reference: chrome.experimental.socket</h2> <h2>API reference: chrome.socket</h2>
<!-- PROPERTIES --> <!-- PROPERTIES -->
<!-- /apiGroup --> <!-- /apiGroup -->
<!-- METHODS --> <!-- METHODS -->
...@@ -251,7 +259,7 @@ ...@@ -251,7 +259,7 @@
<h4>bind</h4> <h4>bind</h4>
<div class="summary"> <div class="summary">
<!-- Note: intentionally longer 80 columns --> <!-- Note: intentionally longer 80 columns -->
<span>chrome.experimental.socket.bind</span>(<span class="null"><span>integer</span> <span>chrome.socket.bind</span>(<span class="null"><span>integer</span>
<var><span>socketId</span></var></span><span class="null"><span>, </span><span>string</span> <var><span>socketId</span></var></span><span class="null"><span>, </span><span>string</span>
<var><span>address</span></var></span><span class="null"><span>, </span><span>integer</span> <var><span>address</span></var></span><span class="null"><span>, </span><span>integer</span>
<var><span>port</span></var></span><span class="null"><span>, </span><span>function</span> <var><span>port</span></var></span><span class="null"><span>, </span><span>function</span>
...@@ -401,7 +409,7 @@ ...@@ -401,7 +409,7 @@
<h4>connect</h4> <h4>connect</h4>
<div class="summary"> <div class="summary">
<!-- Note: intentionally longer 80 columns --> <!-- Note: intentionally longer 80 columns -->
<span>chrome.experimental.socket.connect</span>(<span class="null"><span>integer</span> <span>chrome.socket.connect</span>(<span class="null"><span>integer</span>
<var><span>socketId</span></var></span><span class="null"><span>, </span><span>string</span> <var><span>socketId</span></var></span><span class="null"><span>, </span><span>string</span>
<var><span>hostname</span></var></span><span class="null"><span>, </span><span>integer</span> <var><span>hostname</span></var></span><span class="null"><span>, </span><span>integer</span>
<var><span>port</span></var></span><span class="null"><span>, </span><span>function</span> <var><span>port</span></var></span><span class="null"><span>, </span><span>function</span>
...@@ -551,8 +559,8 @@ ...@@ -551,8 +559,8 @@
<h4>create</h4> <h4>create</h4>
<div class="summary"> <div class="summary">
<!-- Note: intentionally longer 80 columns --> <!-- Note: intentionally longer 80 columns -->
<span>chrome.experimental.socket.create</span>(<span class="null"><span>experimental.socket.SocketType</span> <span>chrome.socket.create</span>(<span class="null"><span>socket.SocketType</span>
<var><span>type</span></var></span><span class="optional"><span>, </span><span>experimental.socket.CreateOptions</span> <var><span>type</span></var></span><span class="optional"><span>, </span><span>socket.CreateOptions</span>
<var><span>options</span></var></span><span class="null"><span>, </span><span>function</span> <var><span>options</span></var></span><span class="null"><span>, </span><span>function</span>
<var><span>CreateCallback</span></var></span>)</div> <var><span>CreateCallback</span></var></span>)</div>
<div class="description"> <div class="description">
...@@ -570,7 +578,7 @@ ...@@ -570,7 +578,7 @@
( (
<span id="typeTemplate"> <span id="typeTemplate">
<span> <span>
<a href="experimental.socket.html#type-experimental.socket.SocketType">experimental.socket.SocketType</a> <a href="socket.html#type-socket.SocketType">socket.SocketType</a>
</span> </span>
</span> </span>
) )
...@@ -594,7 +602,7 @@ ...@@ -594,7 +602,7 @@
<span class="optional">optional</span> <span class="optional">optional</span>
<span id="typeTemplate"> <span id="typeTemplate">
<span> <span>
<a href="experimental.socket.html#type-experimental.socket.CreateOptions">experimental.socket.CreateOptions</a> <a href="socket.html#type-socket.CreateOptions">socket.CreateOptions</a>
</span> </span>
</span> </span>
) )
...@@ -645,7 +653,7 @@ ...@@ -645,7 +653,7 @@
( (
<span id="typeTemplate"> <span id="typeTemplate">
<span> <span>
<a href="experimental.socket.html#type-experimental.socket.CreateInfo">experimental.socket.CreateInfo</a> <a href="socket.html#type-socket.CreateInfo">socket.CreateInfo</a>
</span> </span>
</span> </span>
) )
...@@ -678,7 +686,7 @@ ...@@ -678,7 +686,7 @@
<h4>destroy</h4> <h4>destroy</h4>
<div class="summary"> <div class="summary">
<!-- Note: intentionally longer 80 columns --> <!-- Note: intentionally longer 80 columns -->
<span>chrome.experimental.socket.destroy</span>(<span class="null"><span>integer</span> <span>chrome.socket.destroy</span>(<span class="null"><span>integer</span>
<var><span>socketId</span></var></span>)</div> <var><span>socketId</span></var></span>)</div>
<div class="description"> <div class="description">
<p>Destroys the socket. Each socket created should be destroyed after use.</p> <p>Destroys the socket. Each socket created should be destroyed after use.</p>
...@@ -721,7 +729,7 @@ ...@@ -721,7 +729,7 @@
<h4>disconnect</h4> <h4>disconnect</h4>
<div class="summary"> <div class="summary">
<!-- Note: intentionally longer 80 columns --> <!-- Note: intentionally longer 80 columns -->
<span>chrome.experimental.socket.disconnect</span>(<span class="null"><span>integer</span> <span>chrome.socket.disconnect</span>(<span class="null"><span>integer</span>
<var><span>socketId</span></var></span>)</div> <var><span>socketId</span></var></span>)</div>
<div class="description"> <div class="description">
<p>Disconnects the socket. For UDP sockets, <code>disconnect</code> is a non-operation but is safe to call.</p> <p>Disconnects the socket. For UDP sockets, <code>disconnect</code> is a non-operation but is safe to call.</p>
...@@ -764,7 +772,7 @@ ...@@ -764,7 +772,7 @@
<h4>read</h4> <h4>read</h4>
<div class="summary"> <div class="summary">
<!-- Note: intentionally longer 80 columns --> <!-- Note: intentionally longer 80 columns -->
<span>chrome.experimental.socket.read</span>(<span class="null"><span>integer</span> <span>chrome.socket.read</span>(<span class="null"><span>integer</span>
<var><span>socketId</span></var></span><span class="optional"><span>, </span><span>integer</span> <var><span>socketId</span></var></span><span class="optional"><span>, </span><span>integer</span>
<var><span>bufferSize</span></var></span><span class="null"><span>, </span><span>function</span> <var><span>bufferSize</span></var></span><span class="null"><span>, </span><span>function</span>
<var><span>ReadCallback</span></var></span>)</div> <var><span>ReadCallback</span></var></span>)</div>
...@@ -858,7 +866,7 @@ ...@@ -858,7 +866,7 @@
( (
<span id="typeTemplate"> <span id="typeTemplate">
<span> <span>
<a href="experimental.socket.html#type-experimental.socket.ReadInfo">experimental.socket.ReadInfo</a> <a href="socket.html#type-socket.ReadInfo">socket.ReadInfo</a>
</span> </span>
</span> </span>
) )
...@@ -891,7 +899,7 @@ ...@@ -891,7 +899,7 @@
<h4>recvFrom</h4> <h4>recvFrom</h4>
<div class="summary"> <div class="summary">
<!-- Note: intentionally longer 80 columns --> <!-- Note: intentionally longer 80 columns -->
<span>chrome.experimental.socket.recvFrom</span>(<span class="null"><span>integer</span> <span>chrome.socket.recvFrom</span>(<span class="null"><span>integer</span>
<var><span>socketId</span></var></span><span class="optional"><span>, </span><span>integer</span> <var><span>socketId</span></var></span><span class="optional"><span>, </span><span>integer</span>
<var><span>bufferSize</span></var></span><span class="null"><span>, </span><span>function</span> <var><span>bufferSize</span></var></span><span class="null"><span>, </span><span>function</span>
<var><span>RecvFromCallback</span></var></span>)</div> <var><span>RecvFromCallback</span></var></span>)</div>
...@@ -985,7 +993,7 @@ ...@@ -985,7 +993,7 @@
( (
<span id="typeTemplate"> <span id="typeTemplate">
<span> <span>
<a href="experimental.socket.html#type-experimental.socket.RecvFromInfo">experimental.socket.RecvFromInfo</a> <a href="socket.html#type-socket.RecvFromInfo">socket.RecvFromInfo</a>
</span> </span>
</span> </span>
) )
...@@ -1018,7 +1026,7 @@ ...@@ -1018,7 +1026,7 @@
<h4>sendTo</h4> <h4>sendTo</h4>
<div class="summary"> <div class="summary">
<!-- Note: intentionally longer 80 columns --> <!-- Note: intentionally longer 80 columns -->
<span>chrome.experimental.socket.sendTo</span>(<span class="null"><span>integer</span> <span>chrome.socket.sendTo</span>(<span class="null"><span>integer</span>
<var><span>socketId</span></var></span><span class="null"><span>, </span><span>ArrayBuffer</span> <var><span>socketId</span></var></span><span class="null"><span>, </span><span>ArrayBuffer</span>
<var><span>data</span></var></span><span class="null"><span>, </span><span>string</span> <var><span>data</span></var></span><span class="null"><span>, </span><span>string</span>
<var><span>address</span></var></span><span class="null"><span>, </span><span>integer</span> <var><span>address</span></var></span><span class="null"><span>, </span><span>integer</span>
...@@ -1159,7 +1167,7 @@ ...@@ -1159,7 +1167,7 @@
( (
<span id="typeTemplate"> <span id="typeTemplate">
<span> <span>
<a href="experimental.socket.html#type-experimental.socket.WriteInfo">experimental.socket.WriteInfo</a> <a href="socket.html#type-socket.WriteInfo">socket.WriteInfo</a>
</span> </span>
</span> </span>
) )
...@@ -1192,7 +1200,7 @@ ...@@ -1192,7 +1200,7 @@
<h4>setKeepAlive</h4> <h4>setKeepAlive</h4>
<div class="summary"> <div class="summary">
<!-- Note: intentionally longer 80 columns --> <!-- Note: intentionally longer 80 columns -->
<span>chrome.experimental.socket.setKeepAlive</span>(<span class="null"><span>integer</span> <span>chrome.socket.setKeepAlive</span>(<span class="null"><span>integer</span>
<var><span>socketId</span></var></span><span class="null"><span>, </span><span>boolean</span> <var><span>socketId</span></var></span><span class="null"><span>, </span><span>boolean</span>
<var><span>enable</span></var></span><span class="optional"><span>, </span><span>integer</span> <var><span>enable</span></var></span><span class="optional"><span>, </span><span>integer</span>
<var><span>delay</span></var></span><span class="null"><span>, </span><span>function</span> <var><span>delay</span></var></span><span class="null"><span>, </span><span>function</span>
...@@ -1343,7 +1351,7 @@ ...@@ -1343,7 +1351,7 @@
<h4>setNoDelay</h4> <h4>setNoDelay</h4>
<div class="summary"> <div class="summary">
<!-- Note: intentionally longer 80 columns --> <!-- Note: intentionally longer 80 columns -->
<span>chrome.experimental.socket.setNoDelay</span>(<span class="null"><span>integer</span> <span>chrome.socket.setNoDelay</span>(<span class="null"><span>integer</span>
<var><span>socketId</span></var></span><span class="null"><span>, </span><span>boolean</span> <var><span>socketId</span></var></span><span class="null"><span>, </span><span>boolean</span>
<var><span>noDelay</span></var></span><span class="null"><span>, </span><span>function</span> <var><span>noDelay</span></var></span><span class="null"><span>, </span><span>function</span>
<var><span>SetNoDelayCallback</span></var></span>)</div> <var><span>SetNoDelayCallback</span></var></span>)</div>
...@@ -1469,7 +1477,7 @@ ...@@ -1469,7 +1477,7 @@
<h4>write</h4> <h4>write</h4>
<div class="summary"> <div class="summary">
<!-- Note: intentionally longer 80 columns --> <!-- Note: intentionally longer 80 columns -->
<span>chrome.experimental.socket.write</span>(<span class="null"><span>integer</span> <span>chrome.socket.write</span>(<span class="null"><span>integer</span>
<var><span>socketId</span></var></span><span class="null"><span>, </span><span>ArrayBuffer</span> <var><span>socketId</span></var></span><span class="null"><span>, </span><span>ArrayBuffer</span>
<var><span>data</span></var></span><span class="null"><span>, </span><span>function</span> <var><span>data</span></var></span><span class="null"><span>, </span><span>function</span>
<var><span>WriteCallback</span></var></span>)</div> <var><span>WriteCallback</span></var></span>)</div>
...@@ -1562,7 +1570,7 @@ ...@@ -1562,7 +1570,7 @@
( (
<span id="typeTemplate"> <span id="typeTemplate">
<span> <span>
<a href="experimental.socket.html#type-experimental.socket.WriteInfo">experimental.socket.WriteInfo</a> <a href="socket.html#type-socket.WriteInfo">socket.WriteInfo</a>
</span> </span>
</span> </span>
) )
...@@ -1600,8 +1608,8 @@ ...@@ -1600,8 +1608,8 @@
<h3 id="types">Types</h3> <h3 id="types">Types</h3>
<!-- iterates over all types --> <!-- iterates over all types -->
<div class="apiItem"> <div class="apiItem">
<a name="type-experimental.socket.SocketType"></a> <a name="type-socket.SocketType"></a>
<h4>experimental.socket.SocketType</h4> <h4>socket.SocketType</h4>
<div> <div>
<dt> <dt>
<em> <em>
...@@ -1628,8 +1636,8 @@ ...@@ -1628,8 +1636,8 @@
<!-- FUNCTION PARAMETERS --> <!-- FUNCTION PARAMETERS -->
</div> </div>
</div><div class="apiItem"> </div><div class="apiItem">
<a name="type-experimental.socket.CreateOptions"></a> <a name="type-socket.CreateOptions"></a>
<h4>experimental.socket.CreateOptions</h4> <h4>socket.CreateOptions</h4>
<div> <div>
<dt> <dt>
<em> <em>
...@@ -1658,8 +1666,8 @@ ...@@ -1658,8 +1666,8 @@
<!-- FUNCTION PARAMETERS --> <!-- FUNCTION PARAMETERS -->
</div> </div>
</div><div class="apiItem"> </div><div class="apiItem">
<a name="type-experimental.socket.CreateInfo"></a> <a name="type-socket.CreateInfo"></a>
<h4>experimental.socket.CreateInfo</h4> <h4>socket.CreateInfo</h4>
<div> <div>
<dt> <dt>
<em> <em>
...@@ -1712,8 +1720,8 @@ ...@@ -1712,8 +1720,8 @@
<!-- FUNCTION PARAMETERS --> <!-- FUNCTION PARAMETERS -->
</div> </div>
</div><div class="apiItem"> </div><div class="apiItem">
<a name="type-experimental.socket.ReadInfo"></a> <a name="type-socket.ReadInfo"></a>
<h4>experimental.socket.ReadInfo</h4> <h4>socket.ReadInfo</h4>
<div> <div>
<dt> <dt>
<em> <em>
...@@ -1791,8 +1799,8 @@ ...@@ -1791,8 +1799,8 @@
<!-- FUNCTION PARAMETERS --> <!-- FUNCTION PARAMETERS -->
</div> </div>
</div><div class="apiItem"> </div><div class="apiItem">
<a name="type-experimental.socket.WriteInfo"></a> <a name="type-socket.WriteInfo"></a>
<h4>experimental.socket.WriteInfo</h4> <h4>socket.WriteInfo</h4>
<div> <div>
<dt> <dt>
<em> <em>
...@@ -1845,8 +1853,8 @@ ...@@ -1845,8 +1853,8 @@
<!-- FUNCTION PARAMETERS --> <!-- FUNCTION PARAMETERS -->
</div> </div>
</div><div class="apiItem"> </div><div class="apiItem">
<a name="type-experimental.socket.RecvFromInfo"></a> <a name="type-socket.RecvFromInfo"></a>
<h4>experimental.socket.RecvFromInfo</h4> <h4>socket.RecvFromInfo</h4>
<div> <div>
<dt> <dt>
<em> <em>
......
chrome/common/extensions/docs/extensions/experimental.html
View file @ b48f7f75
...@@ -252,7 +252,6 @@ on the following experimental APIs: ...@@ -252,7 +252,6 @@ on the following experimental APIs:
<a href="experimental.offscreenTabs.html">experimental.offscreenTabs</a></li><li> <a href="experimental.offscreenTabs.html">experimental.offscreenTabs</a></li><li>
<a href="experimental.processes.html">experimental.processes</a></li><li> <a href="experimental.processes.html">experimental.processes</a></li><li>
<a href="experimental.serial.html">experimental.serial</a></li><li> <a href="experimental.serial.html">experimental.serial</a></li><li>
<a href="experimental.socket.html">experimental.socket</a></li><li>
<a href="experimental.speechInput.html">experimental.speechInput</a></li><li> <a href="experimental.speechInput.html">experimental.speechInput</a></li><li>
<a href="experimental.usb.html">experimental.usb</a></li> <a href="experimental.usb.html">experimental.usb</a></li>
</ul> </ul>
......
chrome/common/extensions/docs/extensions/samples.html
View file @ b48f7f75
...@@ -252,6 +252,7 @@ ...@@ -252,6 +252,7 @@
"beff6ecd9677dea0a7c648c5042165b48bb66f09": "PROCESS MONITOR ADDS A BROWSER ACTION THAT MONITORS RESOURCE USAGE OF ALL BROWSER PROCESSES. BROWSER_ACTION EXPERIMENTAL TABS CHROME.EXPERIMENTAL.PROCESSES.ONUPDATED CHROME.EXPERIMENTAL.PROCESSES.ONUPDATEDWITHMEMORY CHROME.EXPERIMENTAL.PROCESSES.TERMINATE", "beff6ecd9677dea0a7c648c5042165b48bb66f09": "PROCESS MONITOR ADDS A BROWSER ACTION THAT MONITORS RESOURCE USAGE OF ALL BROWSER PROCESSES. BROWSER_ACTION EXPERIMENTAL TABS CHROME.EXPERIMENTAL.PROCESSES.ONUPDATED CHROME.EXPERIMENTAL.PROCESSES.ONUPDATEDWITHMEMORY CHROME.EXPERIMENTAL.PROCESSES.TERMINATE",
"3e8e226d87e431296bb110b4f6eb7eec2ca7a826": "PROXY EXTENSION API SAMPLE SET CHROME-SPECIFIC PROXIES; A DEMONSTRATION OF CHROMES PROXY API BACKGROUND_PAGE BROWSER_ACTION PROXY CHROME.BROWSERACTION.SETBADGEBACKGROUNDCOLOR CHROME.BROWSERACTION.SETBADGETEXT CHROME.BROWSERACTION.SETTITLE CHROME.EXTENSION.ISALLOWEDINCOGNITOACCESS CHROME.I18N.GETMESSAGE CHROME.PROXY.ONPROXYERROR", "3e8e226d87e431296bb110b4f6eb7eec2ca7a826": "PROXY EXTENSION API SAMPLE SET CHROME-SPECIFIC PROXIES; A DEMONSTRATION OF CHROMES PROXY API BACKGROUND_PAGE BROWSER_ACTION PROXY CHROME.BROWSERACTION.SETBADGEBACKGROUNDCOLOR CHROME.BROWSERACTION.SETBADGETEXT CHROME.BROWSERACTION.SETTITLE CHROME.EXTENSION.ISALLOWEDINCOGNITOACCESS CHROME.I18N.GETMESSAGE CHROME.PROXY.ONPROXYERROR",
"56a8d2ac24ca7bba78fd88ad57f43fc13c784497": "SAMPLE - OAUTH CONTACTS USES OAUTH TO CONNECT TO GOOGLES CONTACTS SERVICE AND DISPLAY A LIST OF YOUR CONTACTS. BACKGROUND_PAGE BROWSER_ACTION TABS CHROME.BROWSERACTION.ONCLICKED CHROME.BROWSERACTION.SETICON CHROME.EXTENSION.GETBACKGROUNDPAGE CHROME.EXTENSION.GETURL CHROME.TABS.CREATE CHROME.TABS.GET CHROME.TABS.ONUPDATED CHROME.TABS.REMOVE", "56a8d2ac24ca7bba78fd88ad57f43fc13c784497": "SAMPLE - OAUTH CONTACTS USES OAUTH TO CONNECT TO GOOGLES CONTACTS SERVICE AND DISPLAY A LIST OF YOUR CONTACTS. BACKGROUND_PAGE BROWSER_ACTION TABS CHROME.BROWSERACTION.ONCLICKED CHROME.BROWSERACTION.SETICON CHROME.EXTENSION.GETBACKGROUNDPAGE CHROME.EXTENSION.GETURL CHROME.TABS.CREATE CHROME.TABS.GET CHROME.TABS.ONUPDATED CHROME.TABS.REMOVE",
"3c6dfba67f6a7480d931b5a4a646c151ad1a049b": "SANDBOXED FRAME BACKGROUND_PAGE BROWSER_ACTION NOTIFICATIONS CHROME.BROWSERACTION.ONCLICKED",
"38f6e1e17756ede38b1364c7114a738ca717dcbb": "SANDWICHBAR SHOWS AN INFOBAR ON PAGES WHICH CONTAIN THE WORD SANDWICH BACKGROUND_PAGE EXPERIMENTAL CHROME.EXPERIMENTAL.INFOBARS.SHOW", "38f6e1e17756ede38b1364c7114a738ca717dcbb": "SANDWICHBAR SHOWS AN INFOBAR ON PAGES WHICH CONTAIN THE WORD SANDWICH BACKGROUND_PAGE EXPERIMENTAL CHROME.EXPERIMENTAL.INFOBARS.SHOW",
"fc89b35755483af30b66cd72cefa34a43a3e8312": "SHOW TABS IN PROCESS ADDS A BROWSER ACTION SHOWING WHICH TABS SHARE THE CURRENT TABS PROCESS. BROWSER_ACTION EXPERIMENTAL TABS CHROME.EXPERIMENTAL.PROCESSES.GETPROCESSIDFORTAB CHROME.TABS.GET CHROME.TABS.UPDATE CHROME.WINDOWS.GET CHROME.WINDOWS.GETALL CHROME.WINDOWS.GETCURRENT CHROME.WINDOWS.UPDATE", "fc89b35755483af30b66cd72cefa34a43a3e8312": "SHOW TABS IN PROCESS ADDS A BROWSER ACTION SHOWING WHICH TABS SHARE THE CURRENT TABS PROCESS. BROWSER_ACTION EXPERIMENTAL TABS CHROME.EXPERIMENTAL.PROCESSES.GETPROCESSIDFORTAB CHROME.TABS.GET CHROME.TABS.UPDATE CHROME.WINDOWS.GET CHROME.WINDOWS.GETALL CHROME.WINDOWS.GETCURRENT CHROME.WINDOWS.UPDATE",
"a491a2faa1fe79cb49b2fe9ed2720f4723c14184": "SPEAK SELECTION SPEAKS THE CURRENT SELECTION OUT LOUD. <ALL_URLS> BACKGROUND_PAGE BROWSER_ACTION OPTIONS_PAGE TABS TTS CHROME.BROWSERACTION.ONCLICKED CHROME.BROWSERACTION.SETICON CHROME.EXTENSION.GETURL CHROME.TABS.CREATE CHROME.TABS.EXECUTESCRIPT CHROME.TTS.GETVOICES CHROME.TTS.SPEAK CHROME.TTS.STOP CHROME.WINDOWS.GET CHROME.WINDOWS.GETALL", "a491a2faa1fe79cb49b2fe9ed2720f4723c14184": "SPEAK SELECTION SPEAKS THE CURRENT SELECTION OUT LOUD. <ALL_URLS> BACKGROUND_PAGE BROWSER_ACTION OPTIONS_PAGE TABS TTS CHROME.BROWSERACTION.ONCLICKED CHROME.BROWSERACTION.SETICON CHROME.EXTENSION.GETURL CHROME.TABS.CREATE CHROME.TABS.EXECUTESCRIPT CHROME.TTS.GETVOICES CHROME.TTS.SPEAK CHROME.TTS.STOP CHROME.WINDOWS.GET CHROME.WINDOWS.GETALL",
...@@ -339,6 +340,8 @@ ...@@ -339,6 +340,8 @@
<a href="javascript:void(0);" onclick="setFilter('chrome.runtime', this)">chrome.runtime</a><span>, </span> <a href="javascript:void(0);" onclick="setFilter('chrome.runtime', this)">chrome.runtime</a><span>, </span>
</span><span> </span><span>
<a href="javascript:void(0);" onclick="setFilter('chrome.scriptBadge', this)">chrome.scriptBadge</a><span>, </span> <a href="javascript:void(0);" onclick="setFilter('chrome.scriptBadge', this)">chrome.scriptBadge</a><span>, </span>
</span><span>
<a href="javascript:void(0);" onclick="setFilter('chrome.socket', this)">chrome.socket</a><span>, </span>
</span><span> </span><span>
<a href="javascript:void(0);" onclick="setFilter('chrome.storage', this)">chrome.storage</a><span>, </span> <a href="javascript:void(0);" onclick="setFilter('chrome.storage', this)">chrome.storage</a><span>, </span>
</span><span> </span><span>
...@@ -3245,6 +3248,48 @@ ...@@ -3245,6 +3248,48 @@
<a href="../examples/extensions/oauth_contacts.zip">Download source</a> <a href="../examples/extensions/oauth_contacts.zip">Download source</a>
<!-- Only show the Install CRX link if a CRX file is provided --> <!-- Only show the Install CRX link if a CRX file is provided -->
</div> </div>
</div><div class="sample" id="3c6dfba67f6a7480d931b5a4a646c151ad1a049b">
<img class="icon" src="../images/sample-default-icon.png">
<h2 class="name">
<a href="#3c6dfba67f6a7480d931b5a4a646c151ad1a049b">Sandboxed Frame</a>
</h2>
<p class="metadata features">Uses
<span>
<strong>background_page</strong><span>, </span>
</span><span>
<strong>browser_action</strong>
<span> and</span>
</span><span>
<strong>notifications</strong>
</span>
</p>
<p></p>
<div class="apicalls"><strong>Calls:</strong>
<ul>
<li>
<code><a href="browserAction.html#event-onClicked">chrome.browserAction.onClicked</a></code>
</li>
</ul>
</div>
<div class="sourcefiles"><strong>Source files:</strong>
<ul>
<li>
<code><a target="_blank" href="../examples/howto/sandbox/eventpage.html">eventpage.html</a></code>
</li><li>
<code><a target="_blank" href="../examples/howto/sandbox/eventpage.js">eventpage.js</a></code>
</li><li>
<code><a target="_blank" href="../examples/howto/sandbox/handlebars-1.0.0.beta.6.js">handlebars-1.0.0.beta.6.js</a></code>
</li><li>
<code><a target="_blank" href="../examples/howto/sandbox/manifest.json">manifest.json</a></code>
</li><li>
<code><a target="_blank" href="../examples/howto/sandbox/sandbox.html">sandbox.html</a></code>
</li>
</ul>
</div>
<div>
<a href="../examples/howto/sandbox.zip">Download source</a>
<!-- Only show the Install CRX link if a CRX file is provided -->
</div>
</div><div class="sample" id="38f6e1e17756ede38b1364c7114a738ca717dcbb"> </div><div class="sample" id="38f6e1e17756ede38b1364c7114a738ca717dcbb">
<img class="icon" src="../examples/api/infobars/sandwichbar/sandwich-128.png"> <img class="icon" src="../examples/api/infobars/sandwichbar/sandwich-128.png">
<h2 class="name"> <h2 class="name">
......
chrome/common/extensions/docs/extensions/experimental.socket.html → chrome/common/extensions/docs/extensions/socket.html
View file @ b48f7f75
...@@ -17,7 +17,7 @@ ...@@ -17,7 +17,7 @@
<script type="text/javascript" src="../js/api_page_generator.js"></script> <script type="text/javascript" src="../js/api_page_generator.js"></script>
<script type="text/javascript" src="../js/bootstrap.js"></script> <script type="text/javascript" src="../js/bootstrap.js"></script>
<script type="text/javascript" src="../js/sidebar.js"></script> <script type="text/javascript" src="../js/sidebar.js"></script>
<meta name="description" content="Documentation for the chrome.experimental.socket module, which is part of the Google Chrome extension APIs."><title>chrome.experimental.socket - Google Chrome Extensions - Google Code</title></head> <meta name="description" content="Documentation for the chrome.socket module, which is part of the Google Chrome extension APIs."><title>chrome.socket - Google Chrome Extensions - Google Code</title></head>
<body doc-family="extensions"> <link href="../css/ApiRefStyles.css" rel="stylesheet" type="text/css"> <body doc-family="extensions"> <link href="../css/ApiRefStyles.css" rel="stylesheet" type="text/css">
<link href="../css/shared.css" rel="stylesheet" type="text/css"> <link href="../css/shared.css" rel="stylesheet" type="text/css">
<div id="devModeWarning" class="displayModeWarning"> <div id="devModeWarning" class="displayModeWarning">
...@@ -186,14 +186,14 @@ ...@@ -186,14 +186,14 @@
</script> </script>
<div class="g-unit" id="gc-pagecontent"> <div class="g-unit" id="gc-pagecontent">
<div id="pageTitle"> <div id="pageTitle">
<h1 class="page_title">chrome.experimental.socket</h1> <h1 class="page_title">chrome.socket</h1>
</div> </div>
<!-- TABLE OF CONTENTS --> <!-- TABLE OF CONTENTS -->
<div id="toc"> <div id="toc">
<h2>Contents</h2> <h2>Contents</h2>
<ol> <ol>
<li> <li>
<a href="#apiReference">API reference: chrome.experimental.socket</a> <a href="#apiReference">API reference: chrome.socket</a>
<ol> <ol>
<li> <li>
<a href="#global-methods">Methods</a> <a href="#global-methods">Methods</a>
...@@ -227,27 +227,27 @@ ...@@ -227,27 +227,27 @@
<a href="#types">Types</a> <a href="#types">Types</a>
<ol> <ol>
<li> <li>
<a href="#type-experimental.socket.SocketType">SocketType</a> <a href="#type-socket.SocketType">SocketType</a>
<ol> <ol>
</ol> </ol>
</li><li> </li><li>
<a href="#type-experimental.socket.CreateOptions">CreateOptions</a> <a href="#type-socket.CreateOptions">CreateOptions</a>
<ol> <ol>
</ol> </ol>
</li><li> </li><li>
<a href="#type-experimental.socket.CreateInfo">CreateInfo</a> <a href="#type-socket.CreateInfo">CreateInfo</a>
<ol> <ol>
</ol> </ol>
</li><li> </li><li>
<a href="#type-experimental.socket.ReadInfo">ReadInfo</a> <a href="#type-socket.ReadInfo">ReadInfo</a>
<ol> <ol>
</ol> </ol>
</li><li> </li><li>
<a href="#type-experimental.socket.WriteInfo">WriteInfo</a> <a href="#type-socket.WriteInfo">WriteInfo</a>
<ol> <ol>
</ol> </ol>
</li><li> </li><li>
<a href="#type-experimental.socket.RecvFromInfo">RecvFromInfo</a> <a href="#type-socket.RecvFromInfo">RecvFromInfo</a>
<ol> <ol>
</ol> </ol>
</li> </li>
...@@ -259,15 +259,23 @@ ...@@ -259,15 +259,23 @@
</div> </div>
<!-- /TABLE OF CONTENTS --> <!-- /TABLE OF CONTENTS -->
<!-- Standard content lead-in for experimental API pages --> <!-- Standard content lead-in for experimental API pages -->
<p id="classSummary"> <p class="warning">
For information on how to use experimental APIs, see the <a href="experimental.html">chrome.experimental.* APIs</a> page. <!-- Standard content lead-in for APIs that are not yet available on
the stable channel. -->
<em>Warning:</em> This API is still under development. It is only
available for Chrome users on the
<span>
<strong>dev</strong>
<a href="http://www.chromium.org/getting-involved/dev-channel">early
release channel</a>.</span>
<a href="TODO">Learn more</a>.
</p> </p>
<!-- STATIC CONTENT PLACEHOLDER --> <!-- STATIC CONTENT PLACEHOLDER -->
<div id="static"></div> <div id="static"></div>
<!-- API PAGE --> <!-- API PAGE -->
<div class="apiPage"> <div class="apiPage">
<a name="apiReference"></a> <a name="apiReference"></a>
<h2>API reference: chrome.experimental.socket</h2> <h2>API reference: chrome.socket</h2>
<!-- PROPERTIES --> <!-- PROPERTIES -->
<!-- /apiGroup --> <!-- /apiGroup -->
<!-- METHODS --> <!-- METHODS -->
...@@ -280,7 +288,7 @@ ...@@ -280,7 +288,7 @@
<h4>bind</h4> <h4>bind</h4>
<div class="summary"> <div class="summary">
<!-- Note: intentionally longer 80 columns --> <!-- Note: intentionally longer 80 columns -->
<span>chrome.experimental.socket.bind</span>(<span class="null"><span>integer</span> <span>chrome.socket.bind</span>(<span class="null"><span>integer</span>
<var><span>socketId</span></var></span><span class="null"><span>, </span><span>string</span> <var><span>socketId</span></var></span><span class="null"><span>, </span><span>string</span>
<var><span>address</span></var></span><span class="null"><span>, </span><span>integer</span> <var><span>address</span></var></span><span class="null"><span>, </span><span>integer</span>
<var><span>port</span></var></span><span class="null"><span>, </span><span>function</span> <var><span>port</span></var></span><span class="null"><span>, </span><span>function</span>
...@@ -469,7 +477,7 @@ ...@@ -469,7 +477,7 @@
<h4>connect</h4> <h4>connect</h4>
<div class="summary"> <div class="summary">
<!-- Note: intentionally longer 80 columns --> <!-- Note: intentionally longer 80 columns -->
<span>chrome.experimental.socket.connect</span>(<span class="null"><span>integer</span> <span>chrome.socket.connect</span>(<span class="null"><span>integer</span>
<var><span>socketId</span></var></span><span class="null"><span>, </span><span>string</span> <var><span>socketId</span></var></span><span class="null"><span>, </span><span>string</span>
<var><span>hostname</span></var></span><span class="null"><span>, </span><span>integer</span> <var><span>hostname</span></var></span><span class="null"><span>, </span><span>integer</span>
<var><span>port</span></var></span><span class="null"><span>, </span><span>function</span> <var><span>port</span></var></span><span class="null"><span>, </span><span>function</span>
...@@ -658,8 +666,8 @@ ...@@ -658,8 +666,8 @@
<h4>create</h4> <h4>create</h4>
<div class="summary"> <div class="summary">
<!-- Note: intentionally longer 80 columns --> <!-- Note: intentionally longer 80 columns -->
<span>chrome.experimental.socket.create</span>(<span class="null"><span>experimental.socket.SocketType</span> <span>chrome.socket.create</span>(<span class="null"><span>socket.SocketType</span>
<var><span>type</span></var></span><span class="optional"><span>, </span><span>experimental.socket.CreateOptions</span> <var><span>type</span></var></span><span class="optional"><span>, </span><span>socket.CreateOptions</span>
<var><span>options</span></var></span><span class="null"><span>, </span><span>function</span> <var><span>options</span></var></span><span class="null"><span>, </span><span>function</span>
<var><span>CreateCallback</span></var></span>)</div> <var><span>CreateCallback</span></var></span>)</div>
<div class="description"> <div class="description">
...@@ -677,7 +685,7 @@ ...@@ -677,7 +685,7 @@
( (
<span id="typeTemplate"> <span id="typeTemplate">
<span> <span>
<a href="experimental.socket.html#type-experimental.socket.SocketType">experimental.socket.SocketType</a> <a href="socket.html#type-socket.SocketType">socket.SocketType</a>
</span> </span>
</span> </span>
) )
...@@ -701,7 +709,7 @@ ...@@ -701,7 +709,7 @@
<span class="optional">optional</span> <span class="optional">optional</span>
<span id="typeTemplate"> <span id="typeTemplate">
<span> <span>
<a href="experimental.socket.html#type-experimental.socket.CreateOptions">experimental.socket.CreateOptions</a> <a href="socket.html#type-socket.CreateOptions">socket.CreateOptions</a>
</span> </span>
</span> </span>
) )
...@@ -752,7 +760,7 @@ ...@@ -752,7 +760,7 @@
( (
<span id="typeTemplate"> <span id="typeTemplate">
<span> <span>
<a href="experimental.socket.html#type-experimental.socket.CreateInfo">experimental.socket.CreateInfo</a> <a href="socket.html#type-socket.CreateInfo">socket.CreateInfo</a>
</span> </span>
</span> </span>
) )
...@@ -786,7 +794,7 @@ ...@@ -786,7 +794,7 @@
that looks like this: that looks like this:
</p> </p>
<!-- Note: intentionally longer 80 columns --> <!-- Note: intentionally longer 80 columns -->
<pre>function(<span>experimental.socket.CreateInfo createInfo</span>) <span class="subdued">{...}</span>;</pre> <pre>function(<span>socket.CreateInfo createInfo</span>) <span class="subdued">{...}</span>;</pre>
<dl> <dl>
<div> <div>
<div> <div>
...@@ -798,7 +806,7 @@ ...@@ -798,7 +806,7 @@
( (
<span id="typeTemplate"> <span id="typeTemplate">
<span> <span>
<a href="experimental.socket.html#type-experimental.socket.CreateInfo">experimental.socket.CreateInfo</a> <a href="socket.html#type-socket.CreateInfo">socket.CreateInfo</a>
</span> </span>
</span> </span>
) )
...@@ -824,7 +832,7 @@ ...@@ -824,7 +832,7 @@
<h4>destroy</h4> <h4>destroy</h4>
<div class="summary"> <div class="summary">
<!-- Note: intentionally longer 80 columns --> <!-- Note: intentionally longer 80 columns -->
<span>chrome.experimental.socket.destroy</span>(<span class="null"><span>integer</span> <span>chrome.socket.destroy</span>(<span class="null"><span>integer</span>
<var><span>socketId</span></var></span>)</div> <var><span>socketId</span></var></span>)</div>
<div class="description"> <div class="description">
<p>Destroys the socket. Each socket created should be destroyed after use.</p> <p>Destroys the socket. Each socket created should be destroyed after use.</p>
...@@ -867,7 +875,7 @@ ...@@ -867,7 +875,7 @@
<h4>disconnect</h4> <h4>disconnect</h4>
<div class="summary"> <div class="summary">
<!-- Note: intentionally longer 80 columns --> <!-- Note: intentionally longer 80 columns -->
<span>chrome.experimental.socket.disconnect</span>(<span class="null"><span>integer</span> <span>chrome.socket.disconnect</span>(<span class="null"><span>integer</span>
<var><span>socketId</span></var></span>)</div> <var><span>socketId</span></var></span>)</div>
<div class="description"> <div class="description">
<p>Disconnects the socket. For UDP sockets, <code>disconnect</code> is a non-operation but is safe to call.</p> <p>Disconnects the socket. For UDP sockets, <code>disconnect</code> is a non-operation but is safe to call.</p>
...@@ -910,7 +918,7 @@ ...@@ -910,7 +918,7 @@
<h4>read</h4> <h4>read</h4>
<div class="summary"> <div class="summary">
<!-- Note: intentionally longer 80 columns --> <!-- Note: intentionally longer 80 columns -->
<span>chrome.experimental.socket.read</span>(<span class="null"><span>integer</span> <span>chrome.socket.read</span>(<span class="null"><span>integer</span>
<var><span>socketId</span></var></span><span class="optional"><span>, </span><span>integer</span> <var><span>socketId</span></var></span><span class="optional"><span>, </span><span>integer</span>
<var><span>bufferSize</span></var></span><span class="null"><span>, </span><span>function</span> <var><span>bufferSize</span></var></span><span class="null"><span>, </span><span>function</span>
<var><span>ReadCallback</span></var></span>)</div> <var><span>ReadCallback</span></var></span>)</div>
...@@ -1004,7 +1012,7 @@ ...@@ -1004,7 +1012,7 @@
( (
<span id="typeTemplate"> <span id="typeTemplate">
<span> <span>
<a href="experimental.socket.html#type-experimental.socket.ReadInfo">experimental.socket.ReadInfo</a> <a href="socket.html#type-socket.ReadInfo">socket.ReadInfo</a>
</span> </span>
</span> </span>
) )
...@@ -1038,7 +1046,7 @@ ...@@ -1038,7 +1046,7 @@
that looks like this: that looks like this:
</p> </p>
<!-- Note: intentionally longer 80 columns --> <!-- Note: intentionally longer 80 columns -->
<pre>function(<span>experimental.socket.ReadInfo readInfo</span>) <span class="subdued">{...}</span>;</pre> <pre>function(<span>socket.ReadInfo readInfo</span>) <span class="subdued">{...}</span>;</pre>
<dl> <dl>
<div> <div>
<div> <div>
...@@ -1050,7 +1058,7 @@ ...@@ -1050,7 +1058,7 @@
( (
<span id="typeTemplate"> <span id="typeTemplate">
<span> <span>
<a href="experimental.socket.html#type-experimental.socket.ReadInfo">experimental.socket.ReadInfo</a> <a href="socket.html#type-socket.ReadInfo">socket.ReadInfo</a>
</span> </span>
</span> </span>
) )
...@@ -1076,7 +1084,7 @@ ...@@ -1076,7 +1084,7 @@
<h4>recvFrom</h4> <h4>recvFrom</h4>
<div class="summary"> <div class="summary">
<!-- Note: intentionally longer 80 columns --> <!-- Note: intentionally longer 80 columns -->
<span>chrome.experimental.socket.recvFrom</span>(<span class="null"><span>integer</span> <span>chrome.socket.recvFrom</span>(<span class="null"><span>integer</span>
<var><span>socketId</span></var></span><span class="optional"><span>, </span><span>integer</span> <var><span>socketId</span></var></span><span class="optional"><span>, </span><span>integer</span>
<var><span>bufferSize</span></var></span><span class="null"><span>, </span><span>function</span> <var><span>bufferSize</span></var></span><span class="null"><span>, </span><span>function</span>
<var><span>RecvFromCallback</span></var></span>)</div> <var><span>RecvFromCallback</span></var></span>)</div>
...@@ -1170,7 +1178,7 @@ ...@@ -1170,7 +1178,7 @@
( (
<span id="typeTemplate"> <span id="typeTemplate">
<span> <span>
<a href="experimental.socket.html#type-experimental.socket.RecvFromInfo">experimental.socket.RecvFromInfo</a> <a href="socket.html#type-socket.RecvFromInfo">socket.RecvFromInfo</a>
</span> </span>
</span> </span>
) )
...@@ -1204,7 +1212,7 @@ ...@@ -1204,7 +1212,7 @@
that looks like this: that looks like this:
</p> </p>
<!-- Note: intentionally longer 80 columns --> <!-- Note: intentionally longer 80 columns -->
<pre>function(<span>experimental.socket.RecvFromInfo recvFromInfo</span>) <span class="subdued">{...}</span>;</pre> <pre>function(<span>socket.RecvFromInfo recvFromInfo</span>) <span class="subdued">{...}</span>;</pre>
<dl> <dl>
<div> <div>
<div> <div>
...@@ -1216,7 +1224,7 @@ ...@@ -1216,7 +1224,7 @@
( (
<span id="typeTemplate"> <span id="typeTemplate">
<span> <span>
<a href="experimental.socket.html#type-experimental.socket.RecvFromInfo">experimental.socket.RecvFromInfo</a> <a href="socket.html#type-socket.RecvFromInfo">socket.RecvFromInfo</a>
</span> </span>
</span> </span>
) )
...@@ -1242,7 +1250,7 @@ ...@@ -1242,7 +1250,7 @@
<h4>sendTo</h4> <h4>sendTo</h4>
<div class="summary"> <div class="summary">
<!-- Note: intentionally longer 80 columns --> <!-- Note: intentionally longer 80 columns -->
<span>chrome.experimental.socket.sendTo</span>(<span class="null"><span>integer</span> <span>chrome.socket.sendTo</span>(<span class="null"><span>integer</span>
<var><span>socketId</span></var></span><span class="null"><span>, </span><span>ArrayBuffer</span> <var><span>socketId</span></var></span><span class="null"><span>, </span><span>ArrayBuffer</span>
<var><span>data</span></var></span><span class="null"><span>, </span><span>string</span> <var><span>data</span></var></span><span class="null"><span>, </span><span>string</span>
<var><span>address</span></var></span><span class="null"><span>, </span><span>integer</span> <var><span>address</span></var></span><span class="null"><span>, </span><span>integer</span>
...@@ -1383,7 +1391,7 @@ ...@@ -1383,7 +1391,7 @@
( (
<span id="typeTemplate"> <span id="typeTemplate">
<span> <span>
<a href="experimental.socket.html#type-experimental.socket.WriteInfo">experimental.socket.WriteInfo</a> <a href="socket.html#type-socket.WriteInfo">socket.WriteInfo</a>
</span> </span>
</span> </span>
) )
...@@ -1417,7 +1425,7 @@ ...@@ -1417,7 +1425,7 @@
that looks like this: that looks like this:
</p> </p>
<!-- Note: intentionally longer 80 columns --> <!-- Note: intentionally longer 80 columns -->
<pre>function(<span>experimental.socket.WriteInfo writeInfo</span>) <span class="subdued">{...}</span>;</pre> <pre>function(<span>socket.WriteInfo writeInfo</span>) <span class="subdued">{...}</span>;</pre>
<dl> <dl>
<div> <div>
<div> <div>
...@@ -1429,7 +1437,7 @@ ...@@ -1429,7 +1437,7 @@
( (
<span id="typeTemplate"> <span id="typeTemplate">
<span> <span>
<a href="experimental.socket.html#type-experimental.socket.WriteInfo">experimental.socket.WriteInfo</a> <a href="socket.html#type-socket.WriteInfo">socket.WriteInfo</a>
</span> </span>
</span> </span>
) )
...@@ -1455,7 +1463,7 @@ ...@@ -1455,7 +1463,7 @@
<h4>setKeepAlive</h4> <h4>setKeepAlive</h4>
<div class="summary"> <div class="summary">
<!-- Note: intentionally longer 80 columns --> <!-- Note: intentionally longer 80 columns -->
<span>chrome.experimental.socket.setKeepAlive</span>(<span class="null"><span>integer</span> <span>chrome.socket.setKeepAlive</span>(<span class="null"><span>integer</span>
<var><span>socketId</span></var></span><span class="null"><span>, </span><span>boolean</span> <var><span>socketId</span></var></span><span class="null"><span>, </span><span>boolean</span>
<var><span>enable</span></var></span><span class="optional"><span>, </span><span>integer</span> <var><span>enable</span></var></span><span class="optional"><span>, </span><span>integer</span>
<var><span>delay</span></var></span><span class="null"><span>, </span><span>function</span> <var><span>delay</span></var></span><span class="null"><span>, </span><span>function</span>
...@@ -1645,7 +1653,7 @@ ...@@ -1645,7 +1653,7 @@
<h4>setNoDelay</h4> <h4>setNoDelay</h4>
<div class="summary"> <div class="summary">
<!-- Note: intentionally longer 80 columns --> <!-- Note: intentionally longer 80 columns -->
<span>chrome.experimental.socket.setNoDelay</span>(<span class="null"><span>integer</span> <span>chrome.socket.setNoDelay</span>(<span class="null"><span>integer</span>
<var><span>socketId</span></var></span><span class="null"><span>, </span><span>boolean</span> <var><span>socketId</span></var></span><span class="null"><span>, </span><span>boolean</span>
<var><span>noDelay</span></var></span><span class="null"><span>, </span><span>function</span> <var><span>noDelay</span></var></span><span class="null"><span>, </span><span>function</span>
<var><span>SetNoDelayCallback</span></var></span>)</div> <var><span>SetNoDelayCallback</span></var></span>)</div>
...@@ -1810,7 +1818,7 @@ ...@@ -1810,7 +1818,7 @@
<h4>write</h4> <h4>write</h4>
<div class="summary"> <div class="summary">
<!-- Note: intentionally longer 80 columns --> <!-- Note: intentionally longer 80 columns -->
<span>chrome.experimental.socket.write</span>(<span class="null"><span>integer</span> <span>chrome.socket.write</span>(<span class="null"><span>integer</span>
<var><span>socketId</span></var></span><span class="null"><span>, </span><span>ArrayBuffer</span> <var><span>socketId</span></var></span><span class="null"><span>, </span><span>ArrayBuffer</span>
<var><span>data</span></var></span><span class="null"><span>, </span><span>function</span> <var><span>data</span></var></span><span class="null"><span>, </span><span>function</span>
<var><span>WriteCallback</span></var></span>)</div> <var><span>WriteCallback</span></var></span>)</div>
...@@ -1903,7 +1911,7 @@ ...@@ -1903,7 +1911,7 @@
( (
<span id="typeTemplate"> <span id="typeTemplate">
<span> <span>
<a href="experimental.socket.html#type-experimental.socket.WriteInfo">experimental.socket.WriteInfo</a> <a href="socket.html#type-socket.WriteInfo">socket.WriteInfo</a>
</span> </span>
</span> </span>
) )
...@@ -1937,7 +1945,7 @@ ...@@ -1937,7 +1945,7 @@
that looks like this: that looks like this:
</p> </p>
<!-- Note: intentionally longer 80 columns --> <!-- Note: intentionally longer 80 columns -->
<pre>function(<span>experimental.socket.WriteInfo writeInfo</span>) <span class="subdued">{...}</span>;</pre> <pre>function(<span>socket.WriteInfo writeInfo</span>) <span class="subdued">{...}</span>;</pre>
<dl> <dl>
<div> <div>
<div> <div>
...@@ -1949,7 +1957,7 @@ ...@@ -1949,7 +1957,7 @@
( (
<span id="typeTemplate"> <span id="typeTemplate">
<span> <span>
<a href="experimental.socket.html#type-experimental.socket.WriteInfo">experimental.socket.WriteInfo</a> <a href="socket.html#type-socket.WriteInfo">socket.WriteInfo</a>
</span> </span>
</span> </span>
) )
...@@ -1980,8 +1988,8 @@ ...@@ -1980,8 +1988,8 @@
<h3 id="types">Types</h3> <h3 id="types">Types</h3>
<!-- iterates over all types --> <!-- iterates over all types -->
<div class="apiItem"> <div class="apiItem">
<a name="type-experimental.socket.SocketType"></a> <a name="type-socket.SocketType"></a>
<h4>experimental.socket.SocketType</h4> <h4>socket.SocketType</h4>
<div> <div>
<dt> <dt>
<em> <em>
...@@ -2008,8 +2016,8 @@ ...@@ -2008,8 +2016,8 @@
<!-- FUNCTION PARAMETERS --> <!-- FUNCTION PARAMETERS -->
</div> </div>
</div><div class="apiItem"> </div><div class="apiItem">
<a name="type-experimental.socket.CreateOptions"></a> <a name="type-socket.CreateOptions"></a>
<h4>experimental.socket.CreateOptions</h4> <h4>socket.CreateOptions</h4>
<div> <div>
<dt> <dt>
<em> <em>
...@@ -2038,8 +2046,8 @@ ...@@ -2038,8 +2046,8 @@
<!-- FUNCTION PARAMETERS --> <!-- FUNCTION PARAMETERS -->
</div> </div>
</div><div class="apiItem"> </div><div class="apiItem">
<a name="type-experimental.socket.CreateInfo"></a> <a name="type-socket.CreateInfo"></a>
<h4>experimental.socket.CreateInfo</h4> <h4>socket.CreateInfo</h4>
<div> <div>
<dt> <dt>
<em> <em>
...@@ -2092,8 +2100,8 @@ ...@@ -2092,8 +2100,8 @@
<!-- FUNCTION PARAMETERS --> <!-- FUNCTION PARAMETERS -->
</div> </div>
</div><div class="apiItem"> </div><div class="apiItem">
<a name="type-experimental.socket.ReadInfo"></a> <a name="type-socket.ReadInfo"></a>
<h4>experimental.socket.ReadInfo</h4> <h4>socket.ReadInfo</h4>
<div> <div>
<dt> <dt>
<em> <em>
...@@ -2171,8 +2179,8 @@ ...@@ -2171,8 +2179,8 @@
<!-- FUNCTION PARAMETERS --> <!-- FUNCTION PARAMETERS -->
</div> </div>
</div><div class="apiItem"> </div><div class="apiItem">
<a name="type-experimental.socket.WriteInfo"></a> <a name="type-socket.WriteInfo"></a>
<h4>experimental.socket.WriteInfo</h4> <h4>socket.WriteInfo</h4>
<div> <div>
<dt> <dt>
<em> <em>
...@@ -2225,8 +2233,8 @@ ...@@ -2225,8 +2233,8 @@
<!-- FUNCTION PARAMETERS --> <!-- FUNCTION PARAMETERS -->
</div> </div>
</div><div class="apiItem"> </div><div class="apiItem">
<a name="type-experimental.socket.RecvFromInfo"></a> <a name="type-socket.RecvFromInfo"></a>
<h4>experimental.socket.RecvFromInfo</h4> <h4>socket.RecvFromInfo</h4>
<div> <div>
<dt> <dt>
<em> <em>
......
chrome/common/extensions/docs/js/api_page_generator.js
View file @ b48f7f75
...@@ -51,7 +51,6 @@ var MODULE_SCHEMAS = [ ...@@ -51,7 +51,6 @@ var MODULE_SCHEMAS = [
'../../api/experimental_rlz.json', '../../api/experimental_rlz.json',
'../../api/experimental_serial.json', // autogenerated '../../api/experimental_serial.json', // autogenerated
'../../api/experimental_speech_input.json', '../../api/experimental_speech_input.json',
'../../api/experimental_socket.json', // autogenerated
'../../api/experimental_usb.json', // autogenerated '../../api/experimental_usb.json', // autogenerated
'../../api/extension.json', '../../api/extension.json',
'../../api/file_browser_handler.json', '../../api/file_browser_handler.json',
...@@ -77,6 +76,7 @@ var MODULE_SCHEMAS = [ ...@@ -77,6 +76,7 @@ var MODULE_SCHEMAS = [
'../../api/proxy.json', '../../api/proxy.json',
'../../api/runtime.json', '../../api/runtime.json',
'../../api/script_badge.json', '../../api/script_badge.json',
'../../api/socket.json', // autogenerated
'../../api/storage.json', '../../api/storage.json',
'../../api/system_private.json', '../../api/system_private.json',
'../../api/tabs.json', '../../api/tabs.json',
......
chrome/common/extensions/docs/samples.json
View file @ b48f7f75
...@@ -184,17 +184,6 @@ ...@@ -184,17 +184,6 @@
"chrome.experimental.serial.read": "experimental.serial.html#method-read", "chrome.experimental.serial.read": "experimental.serial.html#method-read",
"chrome.experimental.serial.setControlSignals": "experimental.serial.html#method-setControlSignals", "chrome.experimental.serial.setControlSignals": "experimental.serial.html#method-setControlSignals",
"chrome.experimental.serial.write": "experimental.serial.html#method-write", "chrome.experimental.serial.write": "experimental.serial.html#method-write",
"chrome.experimental.socket.bind": "experimental.socket.html#method-bind",
"chrome.experimental.socket.connect": "experimental.socket.html#method-connect",
"chrome.experimental.socket.create": "experimental.socket.html#method-create",
"chrome.experimental.socket.destroy": "experimental.socket.html#method-destroy",
"chrome.experimental.socket.disconnect": "experimental.socket.html#method-disconnect",
"chrome.experimental.socket.read": "experimental.socket.html#method-read",
"chrome.experimental.socket.recvFrom": "experimental.socket.html#method-recvFrom",
"chrome.experimental.socket.sendTo": "experimental.socket.html#method-sendTo",
"chrome.experimental.socket.setKeepAlive": "experimental.socket.html#method-setKeepAlive",
"chrome.experimental.socket.setNoDelay": "experimental.socket.html#method-setNoDelay",
"chrome.experimental.socket.write": "experimental.socket.html#method-write",
"chrome.experimental.speechInput.isRecording": "experimental.speechInput.html#method-isRecording", "chrome.experimental.speechInput.isRecording": "experimental.speechInput.html#method-isRecording",
"chrome.experimental.speechInput.onError": "experimental.speechInput.html#event-onError", "chrome.experimental.speechInput.onError": "experimental.speechInput.html#event-onError",
"chrome.experimental.speechInput.onResult": "experimental.speechInput.html#event-onResult", "chrome.experimental.speechInput.onResult": "experimental.speechInput.html#event-onResult",
...@@ -315,6 +304,17 @@ ...@@ -315,6 +304,17 @@
"chrome.scriptBadge.getPopup": "scriptBadge.html#method-getPopup", "chrome.scriptBadge.getPopup": "scriptBadge.html#method-getPopup",
"chrome.scriptBadge.onClicked": "scriptBadge.html#event-onClicked", "chrome.scriptBadge.onClicked": "scriptBadge.html#event-onClicked",
"chrome.scriptBadge.setPopup": "scriptBadge.html#method-setPopup", "chrome.scriptBadge.setPopup": "scriptBadge.html#method-setPopup",
"chrome.socket.bind": "socket.html#method-bind",
"chrome.socket.connect": "socket.html#method-connect",
"chrome.socket.create": "socket.html#method-create",
"chrome.socket.destroy": "socket.html#method-destroy",
"chrome.socket.disconnect": "socket.html#method-disconnect",
"chrome.socket.read": "socket.html#method-read",
"chrome.socket.recvFrom": "socket.html#method-recvFrom",
"chrome.socket.sendTo": "socket.html#method-sendTo",
"chrome.socket.setKeepAlive": "socket.html#method-setKeepAlive",
"chrome.socket.setNoDelay": "socket.html#method-setNoDelay",
"chrome.socket.write": "socket.html#method-write",
"chrome.storage.StorageArea.clear": "storage.html#method-StorageArea-clear", "chrome.storage.StorageArea.clear": "storage.html#method-StorageArea-clear",
"chrome.storage.StorageArea.get": "storage.html#method-StorageArea-get", "chrome.storage.StorageArea.get": "storage.html#method-StorageArea-get",
"chrome.storage.StorageArea.getBytesInUse": "storage.html#method-StorageArea-getBytesInUse", "chrome.storage.StorageArea.getBytesInUse": "storage.html#method-StorageArea-getBytesInUse",
......
chrome/test/data/extensions/api_test/socket/api/background.js
View file @ b48f7f75
...@@ -10,7 +10,7 @@ ...@@ -10,7 +10,7 @@
const request = "0100000005320000005hello"; const request = "0100000005320000005hello";
var expectedResponsePattern = /0100000005320000005.{11}/; var expectedResponsePattern = /0100000005320000005.{11}/;
const socket = chrome.experimental.socket; const socket = chrome.socket;
var address; var address;
var bytesWritten = 0; var bytesWritten = 0;
var dataAsString; var dataAsString;
......
chrome/test/data/extensions/api_test/socket/api/manifest.json
View file @ b48f7f75
...@@ -2,14 +2,13 @@ ...@@ -2,14 +2,13 @@
"name": "chrome.socket", "name": "chrome.socket",
"version": "0.1", "version": "0.1",
"manifest_version": 2, "manifest_version": 2,
"description": "end-to-end browser test for chrome.experimental.socket API", "description": "end-to-end browser test for chrome.socket API",
"app": { "app": {
"background": { "background": {
"scripts": ["background.js"] "scripts": ["background.js"]
} }
}, },
"permissions": [ "permissions": [
"experimental",
"socket" "socket"
] ]
} }
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment