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

chrome/browser/chromeos/login/login_utils.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 "chrome/browser/chromeos/login/login_utils.h"
 
 #include <algorithm>
 #include <vector>
 
 #include "ash/ash_switches.h"
@@ skipping 516 matching lines @@
       MessageLoop::current()->AssertIdle();
     }
   }
 
   int pid_;
   std::string command_line_;
   PrefService* local_state_;
   base::OneShotTimer<JobRestartRequest> timer_;
 };
 
-class LoginUtilsImpl : public LoginUtils,
-                       public GaiaOAuthConsumer,
-                       public OAuthLoginVerifier::Delegate,
-                       public net::NetworkChangeNotifier::OnlineStateObserver,
-                       public base::SupportsWeakPtr<LoginUtilsImpl> {
+class LoginUtilsImpl
+    : public LoginUtils,
+      public GaiaOAuthConsumer,
+      public OAuthLoginVerifier::Delegate,
+      public net::NetworkChangeNotifier::ConnectionTypeObserver,
+      public base::SupportsWeakPtr<LoginUtilsImpl> {
  public:
   LoginUtilsImpl()
       : pending_requests_(false),
         using_oauth_(false),
         has_cookies_(false),
         delegate_(NULL),
         job_restart_request_(NULL),
         should_restore_auth_session_(false) {
-    net::NetworkChangeNotifier::AddOnlineStateObserver(this);
+    net::NetworkChangeNotifier::AddConnectionTypeObserver(this);
   }
 
   virtual ~LoginUtilsImpl() {
-    net::NetworkChangeNotifier::RemoveOnlineStateObserver(this);
+    net::NetworkChangeNotifier::RemoveConnectionTypeObserver(this);
   }
 
   // LoginUtils implementation:
   virtual void DoBrowserLaunch(Profile* profile,
                                LoginDisplayHost* login_host) OVERRIDE;
   virtual void PrepareProfile(
       const std::string& username,
       const std::string& display_email,
       const std::string& password,
       bool pending_requests,
@@ skipping 26 matching lines @@
   virtual void OnOAuthGetAccessTokenFailure(
       const GoogleServiceAuthError& error) OVERRIDE;
 
   // OAuthLoginVerifier::Delegate overrides.
   virtual void OnOAuthVerificationSucceeded(const std::string& user_name,
                                             const std::string& sid,
                                             const std::string& lsid,
                                             const std::string& auth) OVERRIDE;
   virtual void OnOAuthVerificationFailed(const std::string& user_name) OVERRIDE;
 
-  // net::NetworkChangeNotifier::OnlineStateObserver overrides.
-  virtual void OnOnlineStateChanged(bool online) OVERRIDE;
+  // net::NetworkChangeNotifier::ConnectionTypeObserver overrides.
+  virtual void OnConnectionTypeChanged(
+      net::NetworkChangeNotifier::ConnectionType type) OVERRIDE;
 
   // Given the authenticated credentials from the cookie jar, try to exchange
   // fetch OAuth request, v1 and v2 tokens.
   void FetchOAuth1AccessToken(Profile* auth_profile);
 
  protected:
   virtual std::string GetOffTheRecordCommandLine(
       const GURL& start_url,
       const CommandLine& base_command_line,
       CommandLine *command_line);
@@ skipping 610 matching lines @@
 }
 
 void LoginUtilsImpl::RestoreAuthenticationSession(Profile* user_profile) {
   // We don't need to restore session for demo/guest users.
   if (!UserManager::Get()->IsUserLoggedIn() ||
       UserManager::Get()->IsLoggedInAsGuest() ||
       UserManager::Get()->IsLoggedInAsDemoUser()) {
     return;
   }
 
-  if (!net::NetworkChangeNotifier::IsOffline()) {
+  if (net::NetworkChangeNotifier::GetConnectionType() !=
+          net::NetworkChangeNotifier::CONNECTION_NONE) {

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

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

     should_restore_auth_session_ = false;
     KickStartAuthentication(user_profile);
   } else {
-    // Even if we're online we should wait till initial OnOnlineStateChanged()
-    // call. Otherwise starting fetchers too early may end up cancelling
-    // all request when initial network state is processed.
+    // Even if we're online we should wait till initial
+    // OnConnectionTypeChanged() call. Otherwise starting fetchers too early may
+    // end up cancelling all request when initial network state is processed.

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

initial network state => initial network connection type

     // See http://crbug.com/121643.
     should_restore_auth_session_ = true;
   }
 }
 
 void LoginUtilsImpl::KickStartAuthentication(Profile* user_profile) {
   std::string oauth1_token;
   std::string oauth1_secret;
   if (ReadOAuth1AccessToken(user_profile, &oauth1_token, &oauth1_secret))
     VerifyOAuth1AccessToken(user_profile, oauth1_token, oauth1_secret);
@@ skipping 168 matching lines @@
 void LoginUtilsImpl::OnOAuthVerificationSucceeded(
     const std::string& user_name, const std::string& sid,
     const std::string& lsid, const std::string& auth) {
   // Kick off sync engine.
   GaiaAuthConsumer::ClientLoginResult credentials(sid, lsid, auth,
                                                   std::string());
   StartSignedInServices(ProfileManager::GetDefaultProfile(), credentials);
 }
 
 
-void LoginUtilsImpl::OnOnlineStateChanged(bool online) {
-  if (online && UserManager::Get()->IsUserLoggedIn()) {
+void LoginUtilsImpl::OnConnectionTypeChanged(
+    net::NetworkChangeNotifier::ConnectionType type) {
+  if (type != net::NetworkChangeNotifier::CONNECTION_NONE &&
+      UserManager::Get()->IsUserLoggedIn()) {
     if (oauth_login_verifier_.get() &&
         !oauth_login_verifier_->is_done()) {
       // If we come online for the first time after successful offline login,
       // we need to kick of OAuth token verification process again.
       oauth_login_verifier_->ContinueVerification();
     } else if (should_restore_auth_session_) {
       should_restore_auth_session_ = false;
       Profile* user_profile = ProfileManager::GetDefaultProfile();
       KickStartAuthentication(user_profile);
     }
@@ skipping 14 matching lines @@
 bool LoginUtils::IsWhitelisted(const std::string& username) {
   CrosSettings* cros_settings = CrosSettings::Get();
   bool allow_new_user = false;
   cros_settings->GetBoolean(kAccountsPrefAllowNewUser, &allow_new_user);
   if (allow_new_user)
     return true;
   return cros_settings->FindEmailInList(kAccountsPrefUsers, username);
 }
 
 }  // namespace chromeos