| Index: chrome/browser/ui/ash/system_tray_client.h
|
| diff --git a/chrome/browser/ui/ash/system_tray_client.h b/chrome/browser/ui/ash/system_tray_client.h
|
| index 7a429d4e03e864f05e607f45ac3ae81d9def7846..06908c66f79c0f96f7b44b20fc35c430435fbb4c 100644
|
| --- a/chrome/browser/ui/ash/system_tray_client.h
|
| +++ b/chrome/browser/ui/ash/system_tray_client.h
|
| @@ -8,6 +8,7 @@
|
| #include "ash/public/interfaces/system_tray.mojom.h"
|
| #include "base/macros.h"
|
| #include "chrome/browser/chromeos/system/system_clock_observer.h"
|
| +#include "components/policy/core/common/cloud/cloud_policy_store.h"
|
| #include "content/public/browser/notification_observer.h"
|
| #include "content/public/browser/notification_registrar.h"
|
| #include "mojo/public/cpp/bindings/binding.h"
|
| @@ -26,6 +27,7 @@ class WidgetDelegate;
|
| // TODO: Consider renaming this to SystemTrayClientChromeOS.
|
| class SystemTrayClient : public ash::mojom::SystemTrayClient,
|
| public chromeos::system::SystemClockObserver,
|
| + public policy::CloudPolicyStore::Observer,
|
| public content::NotificationObserver {
|
| public:
|
| SystemTrayClient();
|
| @@ -73,6 +75,7 @@ class SystemTrayClient : public ash::mojom::SystemTrayClient,
|
| void ShowPaletteHelp() override;
|
| void ShowPaletteSettings() override;
|
| void ShowPublicAccountInfo() override;
|
| + void ShowEnterpriseInfo() override;
|
| void ShowNetworkConfigure(const std::string& network_id) override;
|
| void ShowNetworkCreate(const std::string& type) override;
|
| void ShowThirdPartyVpnCreate(const std::string& extension_id) override;
|
| @@ -88,6 +91,12 @@ class SystemTrayClient : public ash::mojom::SystemTrayClient,
|
| // chromeos::system::SystemClockObserver:
|
| void OnSystemClockChanged(chromeos::system::SystemClock* clock) override;
|
|
|
| + // policy::CloudPolicyStore::Observer
|
| + void OnStoreLoaded(policy::CloudPolicyStore* store) override;
|
| + void OnStoreError(policy::CloudPolicyStore* store) override;
|
| +
|
| + void UpdateEnterpriseDomain();
|
| +
|
| // content::NotificationObserver:
|
| void Observe(int type,
|
| const content::NotificationSource& source,
|
| @@ -102,6 +111,11 @@ class SystemTrayClient : public ash::mojom::SystemTrayClient,
|
| // Whether an Adobe Flash component update is available.
|
| bool flash_update_available_ = false;
|
|
|
| + // Avoid sending ash an empty enterprise domain at startup and suppress
|
| + // duplicate IPCs during the session.
|
| + std::string last_enterprise_domain_;
|
| + bool last_active_directory_managed_ = false;
|
| +
|
| content::NotificationRegistrar registrar_;
|
|
|
| DISALLOW_COPY_AND_ASSIGN(SystemTrayClient);
|
|
|