Implement networkingPrivate.getNetworks

chromeos/network/network_util.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_util.h"
 
 #include "base/strings/string_tokenizer.h"
 #include "base/strings/stringprintf.h"
+#include "chromeos/network/favorite_state.h"
 #include "chromeos/network/network_state.h"
 #include "chromeos/network/network_state_handler.h"
 #include "chromeos/network/onc/onc_signature.h"
 #include "chromeos/network/onc/onc_translator.h"
 #include "chromeos/network/shill_property_util.h"
 #include "third_party/cros_system_api/dbus/service_constants.h"
 
 namespace chromeos {
 
 WifiAccessPoint::WifiAccessPoint()
@@ skipping 101 matching lines @@
                                         &scan_result.long_name);
     dict->GetStringWithoutPathExpansion(shill::kShortNameProperty,
                                         &scan_result.short_name);
     dict->GetStringWithoutPathExpansion(shill::kTechnologyProperty,
                                         &scan_result.technology);
     scan_results->push_back(scan_result);
   }
   return true;
 }
 
+scoped_ptr<base::DictionaryValue> TranslateFavoriteStateToONC(
+    const FavoriteState* favorite) {
+  // Get the properties from the FavoriteState.
+  base::DictionaryValue shill_dictionary;
+  favorite->GetStateProperties(&shill_dictionary);
+
+  // If a corresponding NetworkState exists, merge its State properties.
+  const NetworkState* network_state =
+      NetworkHandler::Get()->network_state_handler()->GetNetworkState(
+          favorite->path());
+  if (network_state) {
+    base::DictionaryValue shill_network_dictionary;
+    network_state->GetStateProperties(&shill_network_dictionary);

[pneubeck (no reviews), 2014/05/15 18:28:38]

optional nit: GetStateProperties could merge only omit the initial clear().

[stevenjb, 2014/05/15 20:12:41]

While that is probably safe currently, and I could document the behavior, I
still worry that it would potentially lead to a re-used local unintentionally
combining states. (I'd want to rename it MergeStateProperties at that point,
similar to DictionaryValue).

+    shill_dictionary.MergeDictionary(&shill_network_dictionary);
+  }
+
+  scoped_ptr<base::DictionaryValue> onc_dictionary =
+      TranslateShillServiceToONCPart(
+          shill_dictionary, &onc::kNetworkWithStateSignature);
+  return onc_dictionary.Pass();
+}
+
 scoped_ptr<base::ListValue> TranslateNetworkListToONC(
-    NetworkTypePattern pattern) {
-  NetworkStateHandler::NetworkStateList network_states;
-  NetworkHandler::Get()->network_state_handler()->GetNetworkListByType(
-      pattern, &network_states);
+    NetworkTypePattern pattern,
+    bool configured_only,
+    bool visible_only,
+    int limit) {
+  NetworkStateHandler::FavoriteStateList favorite_states;
+  NetworkHandler::Get()->network_state_handler()->GetFavoriteListByType(
+      pattern, configured_only, visible_only, &favorite_states);
 
+  int count = 0;

[pneubeck (no reviews), 2014/05/15 18:28:38]

optional nit: limit could also be forwarded to GetFavoriteListByType (down to
where the filtering happens)

[stevenjb, 2014/05/15 20:12:41]

Moved limit to GetFavoriteListByType (and changed + documented that 0 == no
limit)

   scoped_ptr<base::ListValue> network_properties_list(new base::ListValue);
-  for (NetworkStateHandler::NetworkStateList::iterator it =
-           network_states.begin();
-       it != network_states.end();
+  for (NetworkStateHandler::FavoriteStateList::iterator it =
+           favorite_states.begin();
+       it != favorite_states.end();
        ++it) {
-    base::DictionaryValue shill_dictionary;
-    (*it)->GetStateProperties(&shill_dictionary);
-
-    scoped_ptr<base::DictionaryValue> onc_network_part =
-        TranslateShillServiceToONCPart(
-            shill_dictionary, &onc::kNetworkWithStateSignature);
-    network_properties_list->Append(onc_network_part.release());
+    scoped_ptr<base::DictionaryValue> onc_dictionary =
+        TranslateFavoriteStateToONC(*it);
+    network_properties_list->Append(onc_dictionary.release());
+    if (++count >= limit)

[pneubeck (no reviews), 2014/05/15 18:28:38]

I'd find it more logical if the condition would be at the beginning, which would
also work for limit=0 ;-D

(the loop condition is also evaluated at the beginning of each iteration)

[stevenjb, 2014/05/15 20:12:41]

meh

+      break;
   }
   return network_properties_list.Pass();
 }
 
 }  // namespace network_util
 }  // namespace chromeos