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

Unified Diff: chrome/browser/ui/webui/ntp/ntp_resource_cache.cc

Issue 2839043004: chromeos: Refactor ash SystemTrayDelegate enterprise methods to mojo (Closed)
Patch Set: review comments Created 3 years, 8 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/ui/ash/system_tray_delegate_chromeos.cc ('k') | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/browser/ui/webui/ntp/ntp_resource_cache.cc
diff --git a/chrome/browser/ui/webui/ntp/ntp_resource_cache.cc b/chrome/browser/ui/webui/ntp/ntp_resource_cache.cc
index 5e2422b52a6d10b5005bb4ef6f2c62eece30f001..9819279e0ca19413c305a84f70a1ed6fa2650a37 100644
--- a/chrome/browser/ui/webui/ntp/ntp_resource_cache.cc
+++ b/chrome/browser/ui/webui/ntp/ntp_resource_cache.cc
@@ -63,6 +63,7 @@
#include "ui/gfx/color_utils.h"
#if defined(OS_CHROMEOS)
+#include "ash/strings/grit/ash_strings.h"
#include "chrome/browser/chromeos/policy/browser_policy_connector_chromeos.h"
#include "chromeos/chromeos_switches.h"
#endif
@@ -344,12 +345,13 @@ void NTPResourceCache::CreateNewTabGuestHTML() {
g_browser_process->platform_part()->browser_policy_connector_chromeos();
std::string enterprise_domain = connector->GetEnterpriseDomain();
+ // TODO(jamescook): What about Active Directory managed devices?
if (!enterprise_domain.empty()) {
// Device is enterprise enrolled.
localized_strings.SetString("enterpriseInfoVisible", "true");
- base::string16 enterprise_info = l10n_util::GetStringFUTF16(
- IDS_DEVICE_OWNED_BY_NOTICE,
- base::UTF8ToUTF16(enterprise_domain));
+ base::string16 enterprise_info =
+ l10n_util::GetStringFUTF16(IDS_ASH_ENTERPRISE_DEVICE_MANAGED_BY,
+ base::UTF8ToUTF16(enterprise_domain));
localized_strings.SetString("enterpriseInfoMessage", enterprise_info);
localized_strings.SetString("enterpriseLearnMore",
l10n_util::GetStringUTF16(IDS_LEARN_MORE));
« no previous file with comments | « chrome/browser/ui/ash/system_tray_delegate_chromeos.cc ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698