Finish implementation of controlled setting indicator

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 141 matching lines @@
 const char kTagCellularAvailable[] = "cellularAvailable";
 const char kTagCellularBusy[] = "cellularBusy";
 const char kTagCellularEnabled[] = "cellularEnabled";
 const char kTagCellularSupportsScan[] = "cellularSupportsScan";
 const char kTagConnect[] = "connect";
 const char kTagConnected[] = "connected";
 const char kTagConnecting[] = "connecting";
 const char kTagConnectionState[] = "connectionState";
 const char kTagControlledBy[] = "controlledBy";
 const char kTagDataRemaining[] = "dataRemaining";
-const char kTagDefault[] = "default";
 const char kTagDeviceConnected[] = "deviceConnected";
 const char kTagDisconnect[] = "disconnect";
 const char kTagEncryption[] = "encryption";
 const char kTagErrorState[] = "errorState";
 const char kTagEsn[] = "esn";
 const char kTagFirmwareRevision[] = "firmwareRevision";
 const char kTagForget[] = "forget";
 const char kTagFrequency[] = "frequency";
 const char kTagGsm[] = "gsm";
 const char kTagHardwareAddress[] = "hardwareAddress";
@@ skipping 23 matching lines @@
 const char kTagPlanExpires[] = "planExpires";
 const char kTagPlans[] = "plans";
 const char kTagPlanSummary[] = "planSummary";
 const char kTagPlanType[] = "planType";
 const char kTagPolicy[] = "policy";
 const char kTagPreferred[] = "preferred";
 const char kTagPrlVersion[] = "prlVersion";
 const char kTagProvider_type[] = "provider_type";
 const char kTagProviderApnList[] = "providerApnList";
 const char kTagRecommended[] = "recommended";
+const char kTagRecommendedValue[] = "recommendedValue";
 const char kTagRemembered[] = "remembered";
 const char kTagRememberedList[] = "rememberedList";
 const char kTagRestrictedPool[] = "restrictedPool";
 const char kTagRoamingState[] = "roamingState";
 const char kTagServerHostname[] = "serverHostname";
 const char kTagService_name[] = "service_name";
 const char kTagCarriers[] = "carriers";
 const char kTagCurrentCarrierIndex[] = "currentCarrierIndex";
 const char kTagServiceName[] = "serviceName";
 const char kTagServicePath[] = "servicePath";
@@ skipping 270 matching lines @@
          type == chromeos::TYPE_WIMAX ||
          type == chromeos::TYPE_VPN;
 }
 
 static bool CanAddNetworkType(int type) {
   return type == chromeos::TYPE_WIFI ||
          type == chromeos::TYPE_VPN ||
          type == chromeos::TYPE_CELLULAR;
 }
 
-// Stores a dictionary under |key| in |settings| that is suitable to be sent
-// to the webui that contains the actual value of a setting and whether it's
-// controlled by policy. Takes ownership of |value|.
+// Decorate pref value as CoreOptionsHandler::CreateValueForPref() does and
+// store it under |key| in |settings|. Takes ownership of |value|.
 void SetValueDictionary(
     DictionaryValue* settings,
     const char* key,
     base::Value* value,
     const chromeos::NetworkPropertyUIData& ui_data) {
-  DictionaryValue* value_dict = new DictionaryValue();
+  DictionaryValue* dict = new DictionaryValue();
   // DictionaryValue::Set() takes ownership of |value|.
-  if (value)
-    value_dict->Set(kTagValue, value);
-  const base::Value* default_value = ui_data.default_value();
-  if (default_value)
-    value_dict->Set(kTagDefault, default_value->DeepCopy());
+  dict->Set(kTagValue, value);
+  const base::Value* recommended_value = ui_data.default_value();
   if (ui_data.managed())
-    value_dict->SetString(kTagControlledBy, kTagPolicy);
-  else if (ui_data.recommended())
-    value_dict->SetString(kTagControlledBy, kTagRecommended);
-  settings->Set(key, value_dict);
+    dict->SetString(kTagControlledBy, kTagPolicy);
+  else if (recommended_value && recommended_value->Equals(value))
+    dict->SetString(kTagControlledBy, kTagRecommended);
+
+  if (recommended_value)
+    dict->Set(kTagRecommendedValue, recommended_value->DeepCopy());
+  settings->Set(key, dict);
 }
 
 // Fills |dictionary| with the configuration details of |vpn|. |onc| is required
 // for augmenting the policy-managed information.
 void PopulateVPNDetails(
     const chromeos::VirtualNetwork* vpn,
     const base::DictionaryValue& onc,
     DictionaryValue* dictionary) {
   dictionary->SetString(kTagService_name, vpn->name());
   bool remembered = (vpn->profile_type() != chromeos::PROFILE_NONE);
@@ skipping 1275 matching lines @@
 
   dictionary->SetBoolean(kTagWimaxEnabled, cros_->wimax_enabled());
   dictionary->SetBoolean(kTagWimaxAvailable, cros_->wimax_available());
   dictionary->SetBoolean(kTagWimaxBusy, cros_->wimax_busy());
   // TODO(kevers): The use of 'offline_mode' is not quite correct.  Update once
   // we have proper back-end support.
   dictionary->SetBoolean(kTagAirplaneMode, cros_->offline_mode());
 }
 
 }  // namespace options