diff options
| author | dilmah@chromium.org <dilmah@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-10-25 16:04:43 +0000 |
|---|---|---|
| committer | dilmah@chromium.org <dilmah@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-10-25 16:04:43 +0000 |
| commit | 749756bb44d5b4d91a130377b04f9ce1e6d4bb7e (patch) | |
| tree | adb9488f7b6bff1f43b1c5f19e4c23a7b544fe9b /chrome/browser/chromeos/web_socket_proxy_controller.h | |
| parent | aa6b0211104ed683394cbe6924f6d60b51cd429c (diff) | |
| download | chromium_src-749756bb44d5b4d91a130377b04f9ce1e6d4bb7e.zip chromium_src-749756bb44d5b4d91a130377b04f9ce1e6d4bb7e.tar.gz chromium_src-749756bb44d5b4d91a130377b04f9ce1e6d4bb7e.tar.bz2 | |
websocket-to-TCP proxy: observe value of listening port in right place.
Also minor change for new API: increase timeout for waiting WEB_SOCKET_PROXY_STARTED notification. New API (GetURLForTCP as opposed to GetPassportForTCP) runs on ephemeral port so if port is not known then we cannot construct URL at all. 3 seconds may be too little to launch proxy on slow overloaded machine.
BUG=chromium-os:21942
TEST=Manual+Apitest
Review URL: http://codereview.chromium.org/8362027
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@107125 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/browser/chromeos/web_socket_proxy_controller.h')
| -rw-r--r-- | chrome/browser/chromeos/web_socket_proxy_controller.h | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/chrome/browser/chromeos/web_socket_proxy_controller.h b/chrome/browser/chromeos/web_socket_proxy_controller.h index bcee38e..4e8ad0d 100644 --- a/chrome/browser/chromeos/web_socket_proxy_controller.h +++ b/chrome/browser/chromeos/web_socket_proxy_controller.h @@ -29,6 +29,7 @@ class WebSocketProxyController { // All methods can be called on any thread. static void Shutdown(); static bool IsInitiated(); + static int GetPort(); // Returns port listening websocket connections. static bool CheckCredentials( const std::string& extension_id, |