API for connection type (Ethernet/WIFI/WWAN ...) in NetworkChangeNotifier.

remoting/host/signaling_connector.cc

 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "remoting/host/signaling_connector.h"
 
 #include "base/bind.h"
 #include "base/callback.h"
 #include "remoting/host/chromoting_host_context.h"
 #include "remoting/host/url_request_context.h"
@@ skipping 17 matching lines @@
     const OAuthClientInfo& client_info_value)
     : login(login_value),
       refresh_token(refresh_token_value),
       client_info(client_info_value) {
 }
 
 SignalingConnector::SignalingConnector(XmppSignalStrategy* signal_strategy)
     : signal_strategy_(signal_strategy),
       reconnect_attempts_(0),
       refreshing_oauth_token_(false) {
-  net::NetworkChangeNotifier::AddOnlineStateObserver(this);
+  net::NetworkChangeNotifier::AddConnectionTypeObserver(this);
   net::NetworkChangeNotifier::AddIPAddressObserver(this);
   signal_strategy_->AddListener(this);
   ScheduleTryReconnect();
 }
 
 SignalingConnector::~SignalingConnector() {
   signal_strategy_->RemoveListener(this);
-  net::NetworkChangeNotifier::RemoveOnlineStateObserver(this);
+  net::NetworkChangeNotifier::RemoveConnectionTypeObserver(this);
   net::NetworkChangeNotifier::RemoveIPAddressObserver(this);
 }
 
 void SignalingConnector::EnableOAuth(
     scoped_ptr<OAuthCredentials> oauth_credentials,
     const base::Closure& oauth_failed_callback,
     net::URLRequestContextGetter* url_context) {
   oauth_credentials_ = oauth_credentials.Pass();
   oauth_failed_callback_ = oauth_failed_callback;
   gaia_oauth_client_.reset(new GaiaOAuthClient(kGaiaOAuth2Url, url_context));
@@ skipping 12 matching lines @@
     ScheduleTryReconnect();
   }
 }
 
 void SignalingConnector::OnIPAddressChanged() {
   DCHECK(CalledOnValidThread());
   LOG(INFO) << "IP address has changed.";
   ResetAndTryReconnect();
 }
 
-void SignalingConnector::OnOnlineStateChanged(bool online) {
+void SignalingConnector::OnConnectionTypeChanged(
+    net::NetworkChangeNotifier::ConnectionType type) {
   DCHECK(CalledOnValidThread());
-  if (online) {
+  if (type != net::NetworkChangeNotifier::CONNECTION_NONE) {
     LOG(INFO) << "Network state changed to online.";
     ResetAndTryReconnect();
   }
 }
 
 void SignalingConnector::OnRefreshTokenResponse(const std::string& access_token,
                                                 int expires_seconds) {
   DCHECK(CalledOnValidThread());
   DCHECK(oauth_credentials_.get());
   LOG(INFO) << "Received OAuth token.";
@@ skipping 21 matching lines @@
   DCHECK(CalledOnValidThread());
   LOG(ERROR) << "Network error when trying to update OAuth token: "
              << response_code;
   refreshing_oauth_token_ = false;
   reconnect_attempts_++;
   ScheduleTryReconnect();
 }
 
 void SignalingConnector::ScheduleTryReconnect() {
   DCHECK(CalledOnValidThread());
-  if (timer_.IsRunning() || net::NetworkChangeNotifier::IsOffline())
+  if (timer_.IsRunning() ||
+      net::NetworkChangeNotifier::GetConnectionType() ==
+          net::NetworkChangeNotifier::CONNECTION_NONE)

[wtc, 2012/05/11 01:35:05]

Nit: this line doesn't need to be indented.

     return;
   int delay_s = std::min(1 << (reconnect_attempts_ * 2),
                          kMaxReconnectDelaySeconds);
   timer_.Start(FROM_HERE, base::TimeDelta::FromSeconds(delay_s),
                this, &SignalingConnector::TryReconnect);
 }
 
 void SignalingConnector::ResetAndTryReconnect() {
   DCHECK(CalledOnValidThread());
   signal_strategy_->Disconnect();
@@ skipping 22 matching lines @@
   LOG(INFO) << "Refreshing OAuth token.";
   DCHECK(!refreshing_oauth_token_);
 
   refreshing_oauth_token_ = true;
   gaia_oauth_client_->RefreshToken(
       oauth_credentials_->client_info,
       oauth_credentials_->refresh_token, this);
 }
 
 }  // namespace remoting