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

Unified Diff: ash/system/enterprise/tray_enterprise.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 | « ash/system/enterprise/tray_enterprise.h ('k') | ash/system/enterprise/tray_enterprise_unittest.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: ash/system/enterprise/tray_enterprise.cc
diff --git a/ash/system/enterprise/tray_enterprise.cc b/ash/system/enterprise/tray_enterprise.cc
index 0127d36e5210e948525f74234ee043d7bc9077a1..cd340e113059e9d6b975c8097c3df9b92c5d4179 100644
--- a/ash/system/enterprise/tray_enterprise.cc
+++ b/ash/system/enterprise/tray_enterprise.cc
@@ -7,13 +7,34 @@
#include "ash/login_status.h"
#include "ash/resources/vector_icons/vector_icons.h"
#include "ash/shell.h"
+#include "ash/strings/grit/ash_strings.h"
#include "ash/system/tray/label_tray_view.h"
-#include "ash/system/tray/system_tray_delegate.h"
+#include "ash/system/tray/system_tray_controller.h"
#include "ash/system/tray/system_tray_notifier.h"
#include "base/logging.h"
#include "base/strings/string16.h"
+#include "base/strings/utf_string_conversions.h"
+#include "ui/base/l10n/l10n_util.h"
namespace ash {
+namespace {
+
+base::string16 GetEnterpriseMessage() {
+ SystemTrayController* controller = Shell::Get()->system_tray_controller();
+
+ // Active Directory devices do not show a domain name.
+ if (controller->active_directory_managed())
+ return l10n_util::GetStringUTF16(IDS_ASH_ENTERPRISE_DEVICE_MANAGED);
+
+ if (!controller->enterprise_domain().empty()) {
+ return l10n_util::GetStringFUTF16(
+ IDS_ASH_ENTERPRISE_DEVICE_MANAGED_BY,
+ base::UTF8ToUTF16(controller->enterprise_domain()));
+ }
+ return base::string16();
+}
+
+} // namespace
TrayEnterprise::TrayEnterprise(SystemTray* system_tray)
: SystemTrayItem(system_tray, UMA_ENTERPRISE), tray_view_(nullptr) {
@@ -25,10 +46,8 @@ TrayEnterprise::~TrayEnterprise() {
}
void TrayEnterprise::UpdateEnterpriseMessage() {
- base::string16 message =
- Shell::Get()->system_tray_delegate()->GetEnterpriseMessage();
if (tray_view_)
- tray_view_->SetMessage(message);
+ tray_view_->SetMessage(GetEnterpriseMessage());
}
views::View* TrayEnterprise::CreateDefaultView(LoginStatus status) {
@@ -51,7 +70,7 @@ void TrayEnterprise::OnEnterpriseDomainChanged() {
}
void TrayEnterprise::OnViewClicked(views::View* sender) {
- Shell::Get()->system_tray_delegate()->ShowEnterpriseInfo();
+ Shell::Get()->system_tray_controller()->ShowEnterpriseInfo();
}
} // namespace ash
« no previous file with comments | « ash/system/enterprise/tray_enterprise.h ('k') | ash/system/enterprise/tray_enterprise_unittest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698