Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(3552)

Unified Diff: chrome/browser/policy/policy_status_info.cc

Issue 8413037: Display policy parsing errors in about:policy. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Removed extra byte, rebased Created 9 years, 2 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « chrome/browser/policy/policy_error_map.cc ('k') | chrome/browser/resources/policy.html » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/browser/policy/policy_status_info.cc
diff --git a/chrome/browser/policy/policy_status_info.cc b/chrome/browser/policy/policy_status_info.cc
index 2b740df1f1972c018846526540e7c6b103bae8fd..395bf623bd4ae5a96c5b11b53b347e1e5b8eb71c 100644
--- a/chrome/browser/policy/policy_status_info.cc
+++ b/chrome/browser/policy/policy_status_info.cc
@@ -8,6 +8,8 @@
#include "base/logging.h"
#include "base/utf_string_conversions.h"
+#include "grit/generated_resources.h"
+#include "ui/base/l10n/l10n_util.h"
namespace policy {
@@ -46,8 +48,8 @@ PolicyStatusInfo::~PolicyStatusInfo() {
DictionaryValue* PolicyStatusInfo::GetDictionaryValue() const {
string16 level_string = GetPolicyLevelString(level);
string16 source_type_string = GetSourceTypeString(source_type);
- string16 status_message = status == ENFORCED ? ASCIIToUTF16("ok")
- : error_message;
+ string16 status_message =
+ status == ENFORCED ? l10n_util::GetStringUTF16(IDS_OK) : error_message;
DictionaryValue* result = new DictionaryValue();
result->SetString(std::string(kNameDictPath), name);
result->SetString(std::string(kLevelDictPath), level_string);
« no previous file with comments | « chrome/browser/policy/policy_error_map.cc ('k') | chrome/browser/resources/policy.html » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698