| Index: chrome/browser/chromeos/login/version_info_updater.h
|
| diff --git a/chrome/browser/chromeos/login/version_info_updater.h b/chrome/browser/chromeos/login/version_info_updater.h
|
| index ba650d3e912889163efc482c5d58b62efdd5afcb..baac843c6dd1c44415b5789dd2514f2ea8852627 100644
|
| --- a/chrome/browser/chromeos/login/version_info_updater.h
|
| +++ b/chrome/browser/chromeos/login/version_info_updater.h
|
| @@ -11,12 +11,16 @@
|
| #include "chrome/browser/chromeos/boot_times_loader.h"
|
| #include "chrome/browser/chromeos/version_loader.h"
|
| #include "chrome/browser/policy/cloud_policy_subsystem.h"
|
| +#include "content/public/browser/notification_observer.h"
|
|
|
| namespace chromeos {
|
|
|
| +class CrosSettings;
|
| +
|
| // Fetches all info we want to show on OOBE/Login screens about system
|
| // version, boot times and cloud policy.
|
| -class VersionInfoUpdater : policy::CloudPolicySubsystem::Observer {
|
| +class VersionInfoUpdater : public policy::CloudPolicySubsystem::Observer,
|
| + public content::NotificationObserver {
|
| public:
|
| class Delegate {
|
| public:
|
| @@ -32,7 +36,8 @@ class VersionInfoUpdater : policy::CloudPolicySubsystem::Observer {
|
|
|
| // Called when the enterprise info notice should be updated.
|
| virtual void OnEnterpriseInfoUpdated(
|
| - const std::string& enterprise_info) = 0;
|
| + const std::string& enterprise_info,
|
| + bool reporting_hint) = 0;
|
| };
|
|
|
| explicit VersionInfoUpdater(Delegate* delegate);
|
| @@ -51,6 +56,12 @@ class VersionInfoUpdater : policy::CloudPolicySubsystem::Observer {
|
| policy::CloudPolicySubsystem::PolicySubsystemState state,
|
| policy::CloudPolicySubsystem::ErrorDetails error_details) OVERRIDE;
|
|
|
| + // content::NotificationObserver interface.
|
| + virtual void Observe(
|
| + int type,
|
| + const content::NotificationSource& source,
|
| + const content::NotificationDetails& details) OVERRIDE;
|
| +
|
| // Update the version label.
|
| void UpdateVersionLabel();
|
|
|
| @@ -59,7 +70,8 @@ class VersionInfoUpdater : policy::CloudPolicySubsystem::Observer {
|
|
|
| // Set enterprise domain name.
|
| void SetEnterpriseInfo(const std::string& domain_name,
|
| - const std::string& status_text);
|
| + const std::string& status_text,
|
| + bool reporting_hint);
|
|
|
| // Callback from chromeos::VersionLoader giving the version.
|
| void OnVersion(VersionLoader::Handle handle, std::string version);
|
| @@ -84,6 +96,7 @@ class VersionInfoUpdater : policy::CloudPolicySubsystem::Observer {
|
| std::string version_text_;
|
| std::string enterprise_domain_text_;
|
| std::string enterprise_status_text_;
|
| + bool enterprise_reporting_hint_;
|
|
|
| // Full text for the OS version label.
|
| std::string os_version_label_text_;
|
| @@ -92,6 +105,8 @@ class VersionInfoUpdater : policy::CloudPolicySubsystem::Observer {
|
| scoped_ptr<policy::CloudPolicySubsystem::ObserverRegistrar>
|
| cloud_policy_registrar_;
|
|
|
| + chromeos::CrosSettings* cros_settings_;
|
| +
|
| Delegate* delegate_;
|
|
|
| DISALLOW_COPY_AND_ASSIGN(VersionInfoUpdater);
|
|
|