Chromium Code Reviews| Index: chrome/browser/extensions/extension_web_socket_proxy_private_api.cc |
| diff --git a/chrome/browser/extensions/extension_web_socket_proxy_private_api.cc b/chrome/browser/extensions/extension_web_socket_proxy_private_api.cc |
| index bda21c7352e467bb092866d7e0020d0b6b7756c7..5789de166d0a304caeec4794d5926e9cd3811dc0 100644 |
| --- a/chrome/browser/extensions/extension_web_socket_proxy_private_api.cc |
| +++ b/chrome/browser/extensions/extension_web_socket_proxy_private_api.cc |
| @@ -19,7 +19,11 @@ |
| #endif |
| WebSocketProxyPrivate::WebSocketProxyPrivate() |
| - : is_finalized_(false), listening_port_(-1) { |
| + : is_finalized_(false), |
| + listening_port_(-1) { |
|
miket_OOO
2011/10/24 17:50:46
Is the indentation change needed?
Denis Lagno
2011/10/24 19:47:58
Done.
|
| +#if defined(OS_CHROMEOS) |
| + listening_port_ = chromeos::WebSocketProxyController::GetPort(); |
| +#endif |
| } |
| WebSocketProxyPrivate::~WebSocketProxyPrivate() { |
| @@ -41,7 +45,7 @@ void WebSocketProxyPrivate::Finalize() { |
| if (is_finalized_) |
| return; |
| is_finalized_ = true; |
| - SendResponse(true); |
| + SendResponse(listening_port_ > 0); |
| Release(); |
| } |
| @@ -155,7 +159,7 @@ bool WebSocketProxyPrivateGetURLForTCPFunction::RunImpl() { |
| #endif // defined(OS_CHROMEOS) |
| if (delay_response) { |
| - const int kTimeout = 3; |
| + const int kTimeout = 12; |
|
miket_OOO
2011/10/24 17:50:46
Will you please add some documentation for this va
Denis Lagno
2011/10/24 19:47:58
Done.
|
| timer_.Start(FROM_HERE, base::TimeDelta::FromSeconds(kTimeout), |
| this, &WebSocketProxyPrivate::Finalize); |
| } else { |