| Index: chrome/browser/chromeos/web_socket_proxy_controller.cc
|
| diff --git a/chrome/browser/chromeos/web_socket_proxy_controller.cc b/chrome/browser/chromeos/web_socket_proxy_controller.cc
|
| index d356ff9bd763b90e417d66dd24314cad60282c03..3e673367ad8b076f5c05b00ce4d41217e250eb8c 100644
|
| --- a/chrome/browser/chromeos/web_socket_proxy_controller.cc
|
| +++ b/chrome/browser/chromeos/web_socket_proxy_controller.cc
|
| @@ -33,7 +33,7 @@
|
| namespace {
|
|
|
| class ProxyLifetime
|
| - : public net::NetworkChangeNotifier::OnlineStateObserver,
|
| + : public net::NetworkChangeNotifier::ConnectionTypeObserver,
|
| public content::NotificationObserver {
|
| public:
|
| ProxyLifetime()
|
| @@ -47,14 +47,14 @@ class ProxyLifetime
|
| web_socket_proxy_thread_.message_loop()->PostTask(
|
| FROM_HERE,
|
| base::Bind(&ProxyLifetime::ProxyCallback, base::Unretained(this)));
|
| - net::NetworkChangeNotifier::AddOnlineStateObserver(this);
|
| + net::NetworkChangeNotifier::AddConnectionTypeObserver(this);
|
| registrar_.Add(
|
| this, chrome::NOTIFICATION_WEB_SOCKET_PROXY_STARTED,
|
| content::NotificationService::AllSources());
|
| }
|
|
|
| virtual ~ProxyLifetime() {
|
| - net::NetworkChangeNotifier::RemoveOnlineStateObserver(this);
|
| + net::NetworkChangeNotifier::RemoveConnectionTypeObserver(this);
|
| }
|
|
|
| virtual void Observe(int type, const content::NotificationSource& source,
|
| @@ -69,8 +69,9 @@ class ProxyLifetime
|
| }
|
|
|
| private:
|
| - // net::NetworkChangeNotifier::OnlineStateObserver implementation.
|
| - virtual void OnOnlineStateChanged(bool online) OVERRIDE {
|
| + // net::NetworkChangeNotifier::ConnectionTypeObserver implementation.
|
| + virtual void OnConnectionTypeChanged(
|
| + net::NetworkChangeNotifier::ConnectionType type) OVERRIDE {
|
| DCHECK(chromeos::WebSocketProxyController::IsInitiated());
|
| base::AutoLock alk(lock_);
|
| if (server_)
|
|
|