Chromad: Use different enterprise messaging in tray bubble.

chrome/browser/ui/ash/system_tray_delegate_chromeos.cc

 // Copyright 2013 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "chrome/browser/ui/ash/system_tray_delegate_chromeos.h"
 
 #include <stddef.h>
 
 #include <algorithm>
 #include <memory>
@@ skipping 236 matching lines @@
 }
 
 ash::LoginStatus SystemTrayDelegateChromeOS::GetUserLoginStatus() const {
   return SystemTrayClient::GetUserLoginStatus();
 }
 
 std::string SystemTrayDelegateChromeOS::GetEnterpriseDomain() const {
   return enterprise_domain_;
 }
 
-std::string SystemTrayDelegateChromeOS::GetEnterpriseRealm() const {
-  return enterprise_realm_;
-}
-
 base::string16 SystemTrayDelegateChromeOS::GetEnterpriseMessage() const {
-  if (!GetEnterpriseRealm().empty()) {
-    // TODO(rsorokin): Maybe change a message for the Active Directory devices.
-    return l10n_util::GetStringFUTF16(IDS_DEVICE_OWNED_BY_NOTICE,
-                                      base::UTF8ToUTF16(GetEnterpriseRealm()));
-  }
-  if (!GetEnterpriseDomain().empty()) {
+  if (is_active_directory_managed_) {
+    return l10n_util::GetStringUTF16(IDS_DEVICE_OWNED_BY_AD_NOTICE);
+  } else if (!GetEnterpriseDomain().empty()) {

[stevenjb, 2016/12/21 18:18:04]

No else

[Roman Sorokin (ftl), 2016/12/22 11:18:11]

Done.

     return l10n_util::GetStringFUTF16(IDS_DEVICE_OWNED_BY_NOTICE,
                                       base::UTF8ToUTF16(GetEnterpriseDomain()));
   }
   return base::string16();
 }
 
 std::string SystemTrayDelegateChromeOS::GetSupervisedUserManager() const {
   if (!IsUserSupervised())
     return std::string();
   return SupervisedUserServiceFactory::GetForProfile(user_profile_)->
@@ skipping 585 matching lines @@
   if (!should_run_bluetooth_discovery_)
     return;
   VLOG(1) << "Claiming new Bluetooth device discovery session.";
   bluetooth_discovery_session_ = std::move(discovery_session);
   GetSystemTrayNotifier()->NotifyBluetoothDiscoveringChanged();
 }
 
 void SystemTrayDelegateChromeOS::UpdateEnterpriseDomain() {
   policy::BrowserPolicyConnectorChromeOS* connector =
       g_browser_process->platform_part()->browser_policy_connector_chromeos();
-  std::string enterprise_domain = connector->GetEnterpriseDomain();
-  std::string enterprise_realm = connector->GetRealm();
-  if (enterprise_domain_ != enterprise_domain ||
-      enterprise_realm_ != enterprise_realm) {
-    enterprise_domain_ = enterprise_domain;
-    enterprise_realm_ = enterprise_realm;
-    GetSystemTrayNotifier()->NotifyEnterpriseDomainChanged();
+  std::string old_enterprise_domain(std::move(enterprise_domain_));
+  enterprise_domain_ = connector->GetEnterpriseDomain();
+  bool old_is_active_directory_managed = is_active_directory_managed_;
+  is_active_directory_managed_ = connector->IsActiveDirectoryManaged();
+  if (is_active_directory_managed_) {

[oshima, 2016/12/21 22:11:33]

Isn't this

if ((is_active_directory_managed_ && enterprise_domain_ != old_) ||
    (is_active_directory_managed != old_is_active_directory_managed) {
   Notify()
}

that is, (domain name changed, or enabled/disabled)
?

[Roman Sorokin (ftl), 2016/12/22 11:18:11]

True. But slightly different
if ((!is_active_directory_managed_ && enterprise_domain_ != old_) ||
    (is_active_directory_managed != old_is_active_directory_managed) {
   Notify()
}
Changed it. Thanks!

+    if (old_is_active_directory_managed)
+      return;
+  } else {
+    if (!old_is_active_directory_managed &&
+        enterprise_domain_ == old_enterprise_domain) {
+      return;
+    }
   }
+  GetSystemTrayNotifier()->NotifyEnterpriseDomainChanged();
 }
 
 // Overridden from CloudPolicyStore::Observer
 void SystemTrayDelegateChromeOS::OnStoreLoaded(
     policy::CloudPolicyStore* store) {
   UpdateEnterpriseDomain();
 }
 
 void SystemTrayDelegateChromeOS::OnStoreError(policy::CloudPolicyStore* store) {
   UpdateEnterpriseDomain();
@@ skipping 85 matching lines @@
   LOG(WARNING) << "SystemTrayDelegateChromeOS::GetChildUserMessage call while "
                << "ENABLE_SUPERVISED_USERS undefined.";
   return base::string16();
 }
 
 ash::SystemTrayDelegate* CreateSystemTrayDelegate() {
   return new SystemTrayDelegateChromeOS();
 }
 
 }  // namespace chromeos