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

Unified Diff: ash/system/tray/system_tray_controller.h

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/tray/system_tray.cc ('k') | ash/system/tray/system_tray_controller.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: ash/system/tray/system_tray_controller.h
diff --git a/ash/system/tray/system_tray_controller.h b/ash/system/tray/system_tray_controller.h
index ab29f2038328435d1964426df2c65aba451074a2..74e5268a057711aa054d3e016919c15d76cc604f 100644
--- a/ash/system/tray/system_tray_controller.h
+++ b/ash/system/tray/system_tray_controller.h
@@ -30,6 +30,8 @@ class ASH_EXPORT SystemTrayController
~SystemTrayController() override;
base::HourClockType hour_clock_type() const { return hour_clock_type_; }
+ const std::string& enterprise_domain() const { return enterprise_domain_; }
+ bool active_directory_managed() const { return active_directory_managed_; }
// Wrappers around the mojom::SystemTrayClient interface.
void ShowSettings();
@@ -50,6 +52,7 @@ class ASH_EXPORT SystemTrayController
void ShowPaletteHelp();
void ShowPaletteSettings();
void ShowPublicAccountInfo();
+ void ShowEnterpriseInfo();
void ShowNetworkConfigure(const std::string& network_id);
void ShowNetworkCreate(const std::string& type);
void ShowThirdPartyVpnCreate(const std::string& extension_id);
@@ -66,6 +69,8 @@ class ASH_EXPORT SystemTrayController
void SetPrimaryTrayEnabled(bool enabled) override;
void SetPrimaryTrayVisible(bool visible) override;
void SetUse24HourClock(bool use_24_hour) override;
+ void SetEnterpriseDomain(const std::string& enterprise_domain,
+ bool active_directory_managed) override;
void ShowUpdateIcon(mojom::UpdateSeverity severity,
bool factory_reset_required,
mojom::UpdateType update_type) override;
@@ -80,6 +85,13 @@ class ASH_EXPORT SystemTrayController
// The type of clock hour display: 12 or 24 hour.
base::HourClockType hour_clock_type_;
+ // The domain name of the organization that manages the device. Empty if the
+ // device is not enterprise enrolled or if it uses Active Directory.
+ std::string enterprise_domain_;
+
+ // Whether this is an Active Directory managed enterprise device.
+ bool active_directory_managed_ = false;
+
DISALLOW_COPY_AND_ASSIGN(SystemTrayController);
};
« no previous file with comments | « ash/system/tray/system_tray.cc ('k') | ash/system/tray/system_tray_controller.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698