Merge FavoriteState into NetworkState

chrome/browser/ui/webui/options/chromeos/internet_options_handler.cc

Index: chrome/browser/ui/webui/options/chromeos/internet_options_handler.cc
diff --git a/chrome/browser/ui/webui/options/chromeos/internet_options_handler.cc b/chrome/browser/ui/webui/options/chromeos/internet_options_handler.cc
index 82ffaa5a73f69595e7aac33fc8d7c418d2687fb9..249333bda465f2442d41c78c994512826659f97e 100644
--- a/chrome/browser/ui/webui/options/chromeos/internet_options_handler.cc
+++ b/chrome/browser/ui/webui/options/chromeos/internet_options_handler.cc
@@ -36,7 +36,6 @@
 #include "chrome/browser/ui/webui/options/chromeos/internet_options_handler_strings.h"
 #include "chromeos/chromeos_switches.h"
 #include "chromeos/network/device_state.h"
-#include "chromeos/network/favorite_state.h"
 #include "chromeos/network/managed_network_configuration_handler.h"
 #include "chromeos/network/network_configuration_handler.h"
 #include "chromeos/network/network_connection_handler.h"
@@ -293,25 +292,7 @@ std::string LoggedInUserTypeToJSString(LoginState::LoggedInUserType type) {
   return std::string();
 }
 
-bool HasPolicyForFavorite(const FavoriteState* favorite,
-                          const PrefService* profile_prefs) {
-  return onc::HasPolicyForFavoriteNetwork(
-      profile_prefs, g_browser_process->local_state(), *favorite);
-}
-
-bool HasPolicyForNetwork(const NetworkState* network,
-                         const PrefService* profile_prefs) {
-  const FavoriteState* favorite =
-      NetworkHandler::Get()
-          ->network_state_handler()
-          ->GetFavoriteStateFromServicePath(network->path(),
-                                            true /* configured_only */);
-  if (!favorite)
-    return false;
-  return HasPolicyForFavorite(favorite, profile_prefs);
-}
-
-void SetCommonNetworkInfo(const ManagedState* state,
+void SetCommonNetworkInfo(const NetworkState* state,
                           const std::string& icon_url,
                           base::DictionaryValue* network_info) {
   network_info->SetString(kNetworkInfoKeyIconURL, icon_url);
@@ -339,8 +320,9 @@ base::DictionaryValue* BuildNetworkDictionary(
                            network->IsConnectedState());
   network_info->SetBoolean(kNetworkInfoKeyConnecting,
                            network->IsConnectingState());
-  network_info->SetBoolean(kNetworkInfoKeyPolicyManaged,
-                           HasPolicyForNetwork(network, profile_prefs));
+  bool has_policy = onc::HasPolicyForNetwork(

[pneubeck (no reviews), 2014/06/11 12:44:55]

yuhuu!

[stevenjb, 2014/06/11 23:31:40]

:)

+      profile_prefs, g_browser_process->local_state(), *network);
+  network_info->SetBoolean(kNetworkInfoKeyPolicyManaged, has_policy);
 
   std::string icon_url = ash::network_icon::GetImageUrlForNetwork(

[pneubeck (no reviews), 2014/06/11 12:44:55]

I didn't look too thoroughly, but the code of GetImageUrlForNetwork seems not
fallback to GetImageUrlForDisconnectedNetwork; also the latter is now unused and
could be removed / or be called by GetImageUrlForNetwork.

[stevenjb, 2014/06/11 23:31:40]

Good catch on GetImageUrlForDisconnectedNetwork no longer being needed, and we
should fallback if !visible. Fixed.

       network, ash::network_icon::ICON_TYPE_LIST, icon_scale_factor);
@@ -348,23 +330,6 @@ base::DictionaryValue* BuildNetworkDictionary(
   return network_info.release();
 }
 
-base::DictionaryValue* BuildFavoriteDictionary(
-    const FavoriteState* favorite,
-    float icon_scale_factor,
-    const PrefService* profile_prefs) {
-  scoped_ptr<base::DictionaryValue> network_info(new base::DictionaryValue());
-  network_info->SetBoolean(kNetworkInfoKeyConnectable, false);

[pneubeck (no reviews), 2014/06/11 12:44:55]

as you mentioned elsewhere, these properties of visible networks are not cleared
if a network becomes invisible.
Could this lead to issues here?

[stevenjb, 2014/06/11 23:31:40]

Hmm, maybe. Better safe than sorry, I'll fix this too.

-  network_info->SetBoolean(kNetworkInfoKeyConnected, false);
-  network_info->SetBoolean(kNetworkInfoKeyConnecting, false);
-  network_info->SetBoolean(kNetworkInfoKeyPolicyManaged,
-                           HasPolicyForFavorite(favorite, profile_prefs));
-
-  std::string icon_url = ash::network_icon::GetImageUrlForDisconnectedNetwork(
-      ash::network_icon::ICON_TYPE_LIST, favorite->type(), icon_scale_factor);
-  SetCommonNetworkInfo(favorite, icon_url, network_info.get());
-  return network_info.release();
-}
-
 // Pulls IP information out of a shill service properties dictionary. If
 // |static_ip| is true, then it fetches "StaticIP.*" properties. If not, then it
 // fetches "SavedIP.*" properties. Caller must take ownership of returned
@@ -1738,7 +1703,7 @@ base::ListValue* InternetOptionsHandler::GetWirelessList() {
   base::ListValue* list = new base::ListValue();
 
   NetworkStateHandler::NetworkStateList networks;
-  NetworkHandler::Get()->network_state_handler()->GetNetworkListByType(
+  NetworkHandler::Get()->network_state_handler()->GetVisibleNetworkListByType(
       NetworkTypePattern::Wireless(), &networks);
   for (NetworkStateHandler::NetworkStateList::const_iterator iter =
            networks.begin(); iter != networks.end(); ++iter) {
@@ -1755,7 +1720,7 @@ base::ListValue* InternetOptionsHandler::GetVPNList() {
   base::ListValue* list = new base::ListValue();
 
   NetworkStateHandler::NetworkStateList networks;
-  NetworkHandler::Get()->network_state_handler()->GetNetworkListByType(
+  NetworkHandler::Get()->network_state_handler()->GetVisibleNetworkListByType(
       NetworkTypePattern::VPN(), &networks);
   for (NetworkStateHandler::NetworkStateList::const_iterator iter =
            networks.begin(); iter != networks.end(); ++iter) {
@@ -1771,18 +1736,23 @@ base::ListValue* InternetOptionsHandler::GetVPNList() {
 base::ListValue* InternetOptionsHandler::GetRememberedList() {
   base::ListValue* list = new base::ListValue();
 
-  NetworkStateHandler::FavoriteStateList favorites;
-  NetworkHandler::Get()->network_state_handler()->GetFavoriteList(&favorites);
-  for (NetworkStateHandler::FavoriteStateList::const_iterator iter =
-           favorites.begin(); iter != favorites.end(); ++iter) {
-    const FavoriteState* favorite = *iter;
-    if (favorite->type() != shill::kTypeWifi &&
-        favorite->type() != shill::kTypeVPN)
+  NetworkStateHandler::NetworkStateList networks;
+  NetworkHandler::Get()->network_state_handler()->GetNetworkListByType(
+      NetworkTypePattern::Default(),
+      true /* configured_only */,
+      false /* visible_only */,
+      0 /* no limit */,
+      &networks);
+  for (NetworkStateHandler::NetworkStateList::const_iterator iter =
+           networks.begin(); iter != networks.end(); ++iter) {
+    const NetworkState* network = *iter;
+    if (network->type() != shill::kTypeWifi &&
+        network->type() != shill::kTypeVPN)
       continue;
     list->Append(
-        BuildFavoriteDictionary(favorite,
-                                web_ui()->GetDeviceScaleFactor(),
-                                Profile::FromWebUI(web_ui())->GetPrefs()));
+        BuildNetworkDictionary(network,
+                               web_ui()->GetDeviceScaleFactor(),
+                               Profile::FromWebUI(web_ui())->GetPrefs()));
   }
 
   return list;