Show a different banner in chrome://settings for extension-controlled settings.

chrome/browser/ui/webui/options/core_options_handler.cc

 // Copyright (c) 2011 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/core_options_handler.h"
 
 #include "base/json/json_reader.h"
 #include "base/memory/scoped_ptr.h"
 #include "base/string16.h"
 #include "base/string_number_conversions.h"
@@ skipping 29 matching lines @@
   UpdateClearPluginLSOData();
 }
 
 void CoreOptionsHandler::GetLocalizedValues(
     DictionaryValue* localized_strings) {
   DCHECK(localized_strings);
   // Main
   localized_strings->SetString("title",
       l10n_util::GetStringUTF16(IDS_SETTINGS_TITLE));
 
+  string16 options_term = l10n_util::GetStringUTF16(IDS_OPTIONS_PREFS_TERM);
+
   // Managed prefs
-  localized_strings->SetString("managedPrefsBannerText",
-      l10n_util::GetStringUTF16(IDS_OPTIONS_MANAGED_PREFS));
+  localized_strings->SetString("policyManagedPrefsBannerText",

[Mattias Nissler (ping if slow), 2011/07/13 12:07:58]

Not sure whether it's mandatory, but I personally find code more readable that
aligns the beginning of all parameters to a function. What I'm saying is that
I'd like a line break after the opening parentheses.

[Evan Stade, 2011/07/13 17:06:04]

no it is not mandatory, both styles are acceptable. I think it's best to match
the precedent set by existing nearby code.

+      l10n_util::GetStringFUTF16(IDS_OPTIONS_POLICY_MANAGED_PREFS,
+                                 options_term));
+  localized_strings->SetString("extensionManagedPrefsBannerText",
+      l10n_util::GetStringFUTF16(IDS_OPTIONS_EXTENSION_MANAGED_PREFS,
+                                 options_term));
+  localized_strings->SetString("policyAndExtensionManagedPrefsBannerText",
+      l10n_util::GetStringFUTF16(IDS_OPTIONS_POLICY_EXTENSION_MANAGED_PREFS,
+                                 options_term));
 
   // Search
   RegisterTitle(localized_strings, "searchPage", IDS_OPTIONS_SEARCH_PAGE_TITLE);
   localized_strings->SetString("searchPlaceholder",
       l10n_util::GetStringUTF16(IDS_OPTIONS_SEARCH_PLACEHOLDER));
   localized_strings->SetString("searchPageNoMatches",
       l10n_util::GetStringUTF16(IDS_OPTIONS_SEARCH_PAGE_NO_MATCHES));
   localized_strings->SetString("searchPageHelpLabel",
       l10n_util::GetStringUTF16(IDS_OPTIONS_SEARCH_PAGE_HELP_LABEL));
   localized_strings->SetString("searchPageHelpTitle",
@@ skipping 71 matching lines @@
 Value* CoreOptionsHandler::FetchPref(const std::string& pref_name) {
   PrefService* pref_service = web_ui_->GetProfile()->GetPrefs();
 
   const PrefService::Preference* pref =
       pref_service->FindPreference(pref_name.c_str());
 
   Value* return_value;
   if (pref) {
     DictionaryValue* dict = new DictionaryValue;
     dict->Set("value", pref->GetValue()->DeepCopy());
-    dict->SetBoolean("managed", pref->IsManaged());
-    dict->SetBoolean("extensionControlled", pref->IsExtensionControlled());
+    if (pref->IsManaged()) {

[Evan Stade, 2011/07/13 17:06:04]

no curlies

[Bernhard Bauer, 2011/07/13 22:15:12]

Done.

+      dict->SetString("controlledBy", "policy");
+    } else if (pref->IsExtensionControlled()) {
+      dict->SetString("controlledBy", "extension");
+    }

[Joao da Silva, 2011/07/13 17:35:17]

The code here that creates the DictionaryValue is the same as the code below.
I'd suggest moving it to a common function in the anonymous namespace, and
replacing it here with something similar to
return_value = CreatePrefValue(pref)

WDYT?

[Bernhard Bauer, 2011/07/13 22:15:12]

Good idea. Done.

     dict->SetBoolean("disabled", !pref->IsUserModifiable());
     return_value = dict;
   } else {
     return_value = Value::CreateNullValue();
   }
   return return_value;
 }
 
 void CoreOptionsHandler::ObservePref(const std::string& pref_name) {
   registrar_.Add(pref_name.c_str(), this);
@@ skipping 216 matching lines @@
   if (pref) {
     for (PreferenceCallbackMap::const_iterator iter =
         pref_callback_map_.find(*pref_name);
         iter != pref_callback_map_.end(); ++iter) {
       const std::wstring& callback_function = iter->second;
       ListValue result_value;
       result_value.Append(Value::CreateStringValue(pref_name->c_str()));
 
       DictionaryValue* dict = new DictionaryValue;
       dict->Set("value", pref->GetValue()->DeepCopy());
-      dict->SetBoolean("managed", pref->IsManaged());
-      dict->SetBoolean("extensionControlled", pref->IsExtensionControlled());
+      if (pref->IsManaged()) {
+        dict->SetString("controlledBy", "policy");
+      } else if (pref->IsExtensionControlled()) {
+        dict->SetString("controlledBy", "extension");
+      }

[Joao da Silva, 2011/07/13 17:35:17]

See comment above.

[Bernhard Bauer, 2011/07/13 22:15:12]

Done.

       dict->SetBoolean("disabled", !pref->IsUserModifiable());
       result_value.Append(dict);
 
       web_ui_->CallJavascriptFunction(WideToASCII(callback_function),
                                       result_value);
     }
   }
 }