Chromium Code Reviews| Index: chrome/browser/ui/webui/policy_ui.cc |
| diff --git a/chrome/browser/ui/webui/policy_ui.cc b/chrome/browser/ui/webui/policy_ui.cc |
| index 03d43485804641fe4dced0da2ec12c88bcb51905..088c682c01468e58fbc502a9ca818100345403df 100644 |
| --- a/chrome/browser/ui/webui/policy_ui.cc |
| +++ b/chrome/browser/ui/webui/policy_ui.cc |
| @@ -77,6 +77,10 @@ namespace em = enterprise_management; |
| namespace { |
| +// Strings that map from PolicySource enum to i18n strings. |
| +const char* const kSourceNameStrings[policy::POLICY_SOURCE_COUNT] = {"", |
|
Dan Beam
2015/09/09 21:50:16
eh, this is kinda weird. why do we have to duplic
fhorschig
2015/09/10 11:36:31
Good idea! Was there a special reason to include t
|
| + "sourceEnterprise", "sourceProgrammatic", "sourcePlatform", "sourceCloud"}; |
| + |
| content::WebUIDataSource* CreatePolicyUIHTMLSource() { |
| content::WebUIDataSource* source = |
| content::WebUIDataSource::Create(chrome::kChromeUIPolicyHost); |
| @@ -108,6 +112,7 @@ content::WebUIDataSource* CreatePolicyUIHTMLSource() { |
| source->AddLocalizedString("headerName", IDS_POLICY_HEADER_NAME); |
| source->AddLocalizedString("headerValue", IDS_POLICY_HEADER_VALUE); |
| source->AddLocalizedString("headerStatus", IDS_POLICY_HEADER_STATUS); |
| + source->AddLocalizedString("headerSource", IDS_POLICY_HEADER_SOURCE); |
| source->AddLocalizedString("showExpandedValue", |
| IDS_POLICY_SHOW_EXPANDED_VALUE); |
| source->AddLocalizedString("hideExpandedValue", |
| @@ -116,6 +121,11 @@ content::WebUIDataSource* CreatePolicyUIHTMLSource() { |
| source->AddLocalizedString("scopeDevice", IDS_POLICY_SCOPE_DEVICE); |
| source->AddLocalizedString("levelRecommended", IDS_POLICY_LEVEL_RECOMMENDED); |
| source->AddLocalizedString("levelMandatory", IDS_POLICY_LEVEL_MANDATORY); |
| + source->AddLocalizedString("sourceProgrammatic", |
| + IDS_POLICY_SOURCE_PROGRAMMATIC); |
| + source->AddLocalizedString("sourceEnterprise", IDS_POLICY_SOURCE_ENTERPRISE); |
| + source->AddLocalizedString("sourcePlatform", IDS_POLICY_SOURCE_PLATFORM); |
| + source->AddLocalizedString("sourceCloud", IDS_POLICY_SOURCE_CLOUD); |
|
Dan Beam
2015/09/09 21:50:16
and use kPolicySources here
fhorschig
2015/09/10 11:36:31
Done.
|
| source->AddLocalizedString("ok", IDS_POLICY_OK); |
| source->AddLocalizedString("unset", IDS_POLICY_UNSET); |
| source->AddLocalizedString("unknown", IDS_POLICY_UNKNOWN); |
| @@ -752,6 +762,7 @@ void PolicyUIHandler::GetPolicyValues(const policy::PolicyMap& map, |
| value->SetString("level", "recommended"); |
| else |
| value->SetString("level", "mandatory"); |
| + value->SetString("source", kSourceNameStrings[entry->second.source]); |
|
Dan Beam
2015/09/09 21:50:16
and here
fhorschig
2015/09/10 11:36:30
Done.
|
| base::string16 error = errors->GetErrors(entry->first); |
| if (!error.empty()) |
| value->SetString("error", error); |