Changed wifi arcs to mobile bars for Tether network.

chromeos/components/tether/wifi_hotspot_connector.cc

 // Copyright 2017 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 "chromeos/components/tether/wifi_hotspot_connector.h"
 
 #include "base/bind.h"
 #include "base/guid.h"
 #include "base/memory/ptr_util.h"
 #include "chromeos/network/network_connect.h"
@@ skipping 18 matching lines @@
   network_state_handler_->AddObserver(this, FROM_HERE);
 }
 
 WifiHotspotConnector::~WifiHotspotConnector() {
   network_state_handler_->RemoveObserver(this, FROM_HERE);
 }
 
 void WifiHotspotConnector::ConnectToWifiHotspot(
     const std::string& ssid,
     const std::string& password,
+    const std::string& guid,

[Kyle Horimoto, 2017/04/28 22:07:28]

tether_network_guid

[lesliewatkins, 2017/04/29 00:57:54]

Done.

     const WifiConnectionCallback& callback) {
   DCHECK(!ssid.empty());
   // Note: |password| can be empty in some cases.
 
   if (!callback_.is_null()) {
     DCHECK(timer_->IsRunning());
 
     // If another connection attempt was underway but had not yet completed,
     // call the callback, passing an empty string to signal that the connection
     // did not complete successfully.
     InvokeWifiConnectionCallback(std::string());
   }
 
   ssid_ = ssid;
   password_ = password;
+  guid_ = guid;
   wifi_guid_ = base::GenerateGUID();
   callback_ = callback;
   timer_->Start(FROM_HERE,
                 base::TimeDelta::FromSeconds(kConnectionTimeoutSeconds),
                 base::Bind(&WifiHotspotConnector::OnConnectionTimeout,
                            weak_ptr_factory_.GetWeakPtr()));
 
   base::DictionaryValue properties =
       CreateWifiPropertyDictionary(ssid, password);
   network_connect_->CreateConfiguration(&properties, false /* shared */);
 }
 
 void WifiHotspotConnector::NetworkPropertiesUpdated(
     const NetworkState* network) {
   if (network->guid() != wifi_guid_) {
     // If a different network has been connected, return early and wait for the
     // network with ID |wifi_guid_| is updated.
     return;
   }
 
   if (network->IsConnectedState()) {
     // If a connection occurred, notify observers and exit early.
     InvokeWifiConnectionCallback(wifi_guid_);
     return;
   }
 
   if (network->connectable()) {
-    // If the network is now connectable, initiate a connection to it.
+    bool successful_association =
+        network_state_handler_->AssociateTetherNetworkStateWithWifiNetwork(
+            guid_, wifi_guid_);
+    if (successful_association) {
+      PA_LOG(INFO) << "Wifi network with ID " << wifi_guid_
+                   << " is connectable. Tether network ID: \"" << guid_

[Kyle Horimoto, 2017/04/28 22:07:28]

Add something to the log that says that the networks were associated
successfully.

[lesliewatkins, 2017/04/29 00:57:54]

Done.

+                   << "\", Wi-Fi network ID: \"" << wifi_guid_ << "\"";
+    } else {
+      PA_LOG(INFO) << "Wifi network with ID " << wifi_guid_
+                   << " is connectable, but failed to associate tether network "
+                      "with ID \""
+                   << guid_ << "\" to Wi-Fi network with ID: \"" << wifi_guid_
+                   << "\"";
+    }
+    // If the network is now connectable, associate it with a Tether network

[Kyle Horimoto, 2017/04/28 22:07:28]

nit: Newline before this.

[lesliewatkins, 2017/04/29 00:57:54]

Done.

+    // ASAP so that the correct icon will be displayed in the tray while the
+    // network is connecting.
     network_connect_->ConnectToNetworkId(wifi_guid_);
   }
 }
 
 void WifiHotspotConnector::InvokeWifiConnectionCallback(
     const std::string& wifi_guid) {
   DCHECK(!callback_.is_null());
 
   // |wifi_guid| may be a reference to |wifi_guid_|, so make a copy of it first
   // before clearing it below.
@@ skipping 44 matching lines @@
   InvokeWifiConnectionCallback(std::string());
 }
 
 void WifiHotspotConnector::SetTimerForTest(std::unique_ptr<base::Timer> timer) {
   timer_ = std::move(timer);
 }
 
 }  // namespace tether
 
 }  // namespace chromeos