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"
 #include "chromeos/network/network_handler.h"
 #include "chromeos/network/network_state.h"
 #include "chromeos/network/network_state_handler.h"
 #include "chromeos/network/shill_property_util.h"
 #include "components/proximity_auth/logging/logging.h"
 #include "third_party/cros_system_api/dbus/shill/dbus-constants.h"
 
 namespace chromeos {
 
 namespace tether {
 
 WifiHotspotConnector::WifiHotspotConnector(
     NetworkStateHandler* network_state_handler,
-    NetworkConnect* network_connect)
+    NetworkConnect* network_connect,
+    ActiveHost* active_host)
     : network_state_handler_(network_state_handler),
       network_connect_(network_connect),
+      active_host_(active_host),
       timer_(base::MakeUnique<base::OneShotTimer>()),
       weak_ptr_factory_(this) {
   network_state_handler_->AddObserver(this, FROM_HERE);
 }
 
 WifiHotspotConnector::~WifiHotspotConnector() {
   network_state_handler_->RemoveObserver(this, FROM_HERE);
 }
 
 void WifiHotspotConnector::ConnectToWifiHotspot(
@@ skipping 34 matching lines @@
     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.

[Kyle Horimoto, 2017/04/27 01:28:07]

Move this comment to before the ConnectToNetworkId() call below.

Replace the comment with something that describes why we are associating it ASAP
(to give the user visual feedback that the connection is in progress as early as
we can).

[lesliewatkins, 2017/04/28 21:30:43]

Done.

+    std::string tether_guid = active_host_->GetTetherNetworkGuid();

[Kyle Horimoto, 2017/04/27 01:28:07]

I apologize for not noticing this earlier, but this isn't correct 100% of the
time. If a new connection is started while another connection attempt is in
progress and the ActiveHost has already been updated by this point,
active_host_->GetTetherNetworkGuid() may be a different value from the GUID
associated with the network we are trying to connect to.

Instead of passing the ActiveHost to the constructor of this class, pass the
tether network GUID as a parameter to the ConnectToWifiHotspot() function when
you call it from TetherConnector. You can use ActiveHost::GetTetherNetworkGuid()
to get the GUID at that point.

In ConnectToWifiHotspot(), you can store the GUID like we store ssid_ and
password_. Then, when you reach this point (where you are making the
association), associate the stored GUID and wifi_guid_.

[lesliewatkins, 2017/04/28 21:30:43]

Done.

+    bool successful_association =
+        network_state_handler_->AssociateTetherNetworkStateWithWifiNetwork(
+            tether_guid, wifi_guid_);
+    if (successful_association) {
+      PA_LOG(INFO) << "Wifi network with ID " << wifi_guid_
+                   << " is connectable. Tether network ID: \"" << tether_guid
+                   << "\", 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 \""
+                   << tether_guid << "\" to Wi-Fi network with ID: \""
+                   << wifi_guid_ << "\"";
+    }
+
     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