Changed wifi arcs to mobile bars for Tether network.

chromeos/network/network_state_handler.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 "chromeos/network/network_state_handler.h"
 
 #include <stddef.h>
 
 #include "base/bind.h"
 #include "base/command_line.h"
@@ skipping 571 matching lines @@
   NotifyNetworkListChanged();
   return true;
 }
 
 bool NetworkStateHandler::RemoveTetherNetworkState(const std::string& guid) {
   for (auto iter = tether_network_list_.begin();
        iter != tether_network_list_.end(); ++iter) {
     if (iter->get()->AsNetworkState()->guid() == guid) {
       NetworkState* wifi_network = GetModifiableNetworkStateFromGuid(
           iter->get()->AsNetworkState()->tether_guid());
+

[Kyle Horimoto, 2017/05/03 01:53:34]

nit: Remove changes to functions you did not edit. This makes "git blame" a lot
easier to understand.

[lesliewatkins, 2017/05/03 22:00:24]

Done.

       if (wifi_network)
         wifi_network->set_tether_guid(std::string());
 
       tether_network_list_.erase(iter);
       NotifyNetworkListChanged();
+
       return true;
     }
   }
+  return false;
+}
 
-  return false;
+bool NetworkStateHandler::DisassociateTetherNetworkStateWithWifiNetwork(
+    const std::string& tether_network_guid,
+    const std::string& wifi_network_guid) {
+  bool success = true;
+
+  NetworkState* tether_network =
+      GetModifiableNetworkStateFromGuid(tether_network_guid);
+  NetworkState* wifi_network =
+      GetModifiableNetworkStateFromGuid(wifi_network_guid);
+
+  if (!tether_network) {
+    NET_LOG(ERROR) << "Tether network with guid " << tether_network_guid

[Kyle Horimoto, 2017/05/03 01:53:34]

nit: Make your log more descriptive to tell which function is failing. For
example:

"DisassociateTetherNetworkStateWithWifiNetwork(): Tether network with ID <id>
not registered; could not remove association."

[lesliewatkins, 2017/05/03 22:00:25]

Done.

+                   << " doesn\'t exist.\n";

[Kyle Horimoto, 2017/05/03 01:53:34]

nit: You don't need to escape an apostrophe. Same below.

[lesliewatkins, 2017/05/03 22:00:25]

Done.

+    success = false;
+  } else {
+    tether_network->set_tether_guid(std::string());
+  }
+
+  if (!wifi_network) {
+    NET_LOG(ERROR) << "Wi-Fi network with guid " << wifi_network_guid
+                   << " doesn\'t exist.\n";
+    success = false;
+  } else {
+    wifi_network->set_tether_guid(std::string());
+  }
+

[Kyle Horimoto, 2017/05/03 01:53:34]

You need to call NotifyNetworkListChanged() if at least one of the two has
changed. You'll probably have to use two booleans to track this.

[lesliewatkins, 2017/05/03 22:00:24]

Done.

+  return success;
 }
 
 bool NetworkStateHandler::AssociateTetherNetworkStateWithWifiNetwork(
     const std::string& tether_network_guid,
     const std::string& wifi_network_guid) {
   if (tether_technology_state_ != TECHNOLOGY_ENABLED) {
     NET_LOG(ERROR) << "AssociateTetherNetworkStateWithWifiNetwork() called "
                    << "when Tether networks are not enabled. Cannot "
                    << "associate.";
     return false;
@@ skipping 831 matching lines @@
   if (type.MatchesType(shill::kTypeVPN))
     technologies.emplace_back(shill::kTypeVPN);
   if (type.MatchesType(kTypeTether))
     technologies.emplace_back(kTypeTether);
 
   CHECK_GT(technologies.size(), 0ul);
   return technologies;
 }
 
 }  // namespace chromeos