NetworkState cleanup, pass properties to InitialPropertiesReceived

chrome/browser/ui/webui/options/chromeos/internet_options_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 "chrome/browser/ui/webui/options/chromeos/internet_options_handler.h"
 
 #include <ctype.h>
 
 #include <map>
 #include <string>
@@ skipping 441 matching lines @@
 
 NetworkInfoDictionary::NetworkInfoDictionary(const FavoriteState* favorite,
                                              ui::ScaleFactor icon_scale_factor)
     : service_path_(favorite->path()),
       name_(favorite->name()),
       connecting_(false),
       connected_(false),
       connectable_(false),
       connection_type_(favorite->type()),
       remembered_(true),
-      shared_(favorite->IsShared()),
+      shared_(!favorite->IsPrivate()),
       policy_managed_(favorite->IsManaged()) {
   if (favorite->type() == flimflam::kTypeEthernet)
     name_ = l10n_util::GetStringUTF8(IDS_STATUSBAR_NETWORK_DEVICE_ETHERNET);
   gfx::ImageSkia icon = ash::network_icon::GetImageForDisconnectedNetwork(
       ash::network_icon::ICON_TYPE_LIST, favorite->type());
   SetIcon(icon, icon_scale_factor);
 }
 
 base::DictionaryValue* NetworkInfoDictionary::BuildDictionary() {
   std::string status;
@@ skipping 1082 matching lines @@
   dictionary->SetString(kTagServiceName, network->name());
   dictionary->SetBoolean(kTagConnecting, network->IsConnectingState());
   dictionary->SetBoolean(kTagConnected, network->IsConnectedState());
   dictionary->SetString(kTagConnectionState,
                         ConnectionStateString(network->connection_state()));
   dictionary->SetString(kTagNetworkName, network->name());
   dictionary->SetString(kTagErrorState,
                         ash::network_connect::ErrorString(network->error()));
 
   dictionary->SetBoolean(kTagRemembered, !network->profile_path().empty());
-  bool shared = network->IsShared();
+  bool shared = !network->IsPrivate();
   dictionary->SetBoolean(kTagShared, shared);
 
   const std::string& type = network->type();
   const NetworkState* connected_network =
       NetworkHandler::Get()->network_state_handler()->ConnectedNetworkByType(
           type);
 
   dictionary->SetBoolean(kTagDeviceConnected, connected_network != NULL);
 
   if (type == flimflam::kTypeWifi)
@@ skipping 50 matching lines @@
                            kTagLanguage, dictionary);
 }
 
 void PopulateCellularDetails(const NetworkState* cellular,
                              const base::DictionaryValue& shill_properties,
                              base::DictionaryValue* dictionary) {
   dictionary->SetBoolean(kTagCarrierSelectFlag,
                          CommandLine::ForCurrentProcess()->HasSwitch(
                              chromeos::switches::kEnableCarrierSwitching));
   // Cellular network / connection settings.
-  dictionary->SetString(kTagNetworkTechnology, cellular->technology());
+  dictionary->SetString(kTagNetworkTechnology, cellular->network_technology());
   dictionary->SetString(kTagActivationState,
                         ActivationStateString(cellular->activation_state()));
   dictionary->SetString(kTagRoamingState,
                         RoamingStateString(cellular->roaming()));
   bool restricted = cellular->connection_state() == flimflam::kStatePortal;
   dictionary->SetString(kTagRestrictedPool,
                         restricted ?
                         l10n_util::GetStringUTF8(
                             IDS_CONFIRM_MESSAGEBOX_YES_BUTTON_LABEL) :
                         l10n_util::GetStringUTF8(
@@ skipping 131 matching lines @@
     const MobileConfig::Carrier* carrier =
         MobileConfig::GetInstance()->GetCarrier(carrier_id);
     if (carrier && carrier->show_portal_button()) {
       // The button should be shown for a LTE network even when the LTE network
       // is not connected, but CrOS is online. This is done to enable users to
       // update their plan even if they are out of credits.
       // The button should not be shown when the device's mdn is not set,
       // because the network's proper portal url cannot be generated without it
       const NetworkState* default_network =
           NetworkHandler::Get()->network_state_handler()->DefaultNetwork();
+      const std::string& technology = cellular->network_technology();
       bool force_show_view_account_button =
-          (cellular->technology() == flimflam::kNetworkTechnologyLte ||
-           cellular->technology() == flimflam::kNetworkTechnologyLteAdvanced) &&
+          (technology == flimflam::kNetworkTechnologyLte ||
+           technology == flimflam::kNetworkTechnologyLteAdvanced) &&
           default_network &&
           !mdn.empty();
 
       // The button will trigger ShowMorePlanInfoCallback() which will open
       // carrier specific portal.
       if (cellular->IsConnectedState() || force_show_view_account_button)
         dictionary->SetBoolean(kTagShowViewAccountButton, true);
     }
   }
 }
@@ skipping 165 matching lines @@
       cellular && cellular->support_network_scan());
 
   dictionary->SetBoolean(kTagWimaxAvailable,
                          handler->IsTechnologyAvailable(flimflam::kTypeWimax));
   dictionary->SetBoolean(kTagWimaxEnabled,
                          handler->IsTechnologyEnabled(flimflam::kTypeWimax));
 }
 
 }  // namespace options
 }  // namespace chromeos