Translate device-local account IDs to user IDs

chrome/browser/ui/webui/policy_ui.cc

 // Copyright (c) 2012 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/webui/policy_ui.h"
 
 #include "base/bind.h"
 #include "base/bind_helpers.h"
 #include "base/callback.h"
 #include "base/compiler_specific.h"
@@ skipping 210 matching lines @@
   // CloudPolicyCoreStatusProvider implementation.
   virtual void GetStatus(base::DictionaryValue* dict) OVERRIDE;
 
  private:
   std::string domain_;
 
   DISALLOW_COPY_AND_ASSIGN(DevicePolicyStatusProvider);
 };
 
 // A cloud policy status provider that reads policy status from the policy core
-// associated with the device-local account specified by |account_id| at
-// construction time. The indirection via account ID and
+// associated with the device-local account specified by |user_id| at
+// construction time. The indirection via user ID and
 // DeviceLocalAccountPolicyService is necessary because the device-local account
 // may go away any time behind the scenes, at which point the status message
 // text will indicate CloudPolicyStore::STATUS_BAD_STATE.
 class DeviceLocalAccountPolicyStatusProvider
     : public CloudPolicyStatusProvider,
       public policy::DeviceLocalAccountPolicyService::Observer {
  public:
   DeviceLocalAccountPolicyStatusProvider(
-      const std::string& account_id,
+      const std::string& user_id,
       policy::DeviceLocalAccountPolicyService* service);
   virtual ~DeviceLocalAccountPolicyStatusProvider();
 
   // CloudPolicyStatusProvider implementation.
   virtual void GetStatus(base::DictionaryValue* dict) OVERRIDE;
 
   // policy::DeviceLocalAccountPolicyService::Observer implementation.
-  virtual void OnPolicyUpdated(const std::string& account_id) OVERRIDE;
+  virtual void OnPolicyUpdated(const std::string& user_id) OVERRIDE;
   virtual void OnDeviceLocalAccountsChanged() OVERRIDE;
 
  private:
-  const std::string account_id_;
+  const std::string user_id_;
   policy::DeviceLocalAccountPolicyService* service_;
 
   DISALLOW_COPY_AND_ASSIGN(DeviceLocalAccountPolicyStatusProvider);
 };
 #endif
 
 // The JavaScript message handler for the chrome://policy page.
 class PolicyUIHandler : public content::WebUIMessageHandler,
                         public policy::PolicyService::Observer {
  public:
@@ skipping 107 matching lines @@
 
 DevicePolicyStatusProvider::~DevicePolicyStatusProvider() {
 }
 
 void DevicePolicyStatusProvider::GetStatus(base::DictionaryValue* dict) {
   GetStatusFromCore(core_, dict);
   dict->SetString("domain", domain_);
 }
 
 DeviceLocalAccountPolicyStatusProvider::DeviceLocalAccountPolicyStatusProvider(
-    const std::string& account_id,
+    const std::string& user_id,
     policy::DeviceLocalAccountPolicyService* service)
-      : account_id_(account_id),
+      : user_id_(user_id),
         service_(service) {
   service_->AddObserver(this);
 }
 
 DeviceLocalAccountPolicyStatusProvider::
     ~DeviceLocalAccountPolicyStatusProvider() {
   service_->RemoveObserver(this);
 }
 
 void DeviceLocalAccountPolicyStatusProvider::GetStatus(
     base::DictionaryValue* dict) {
   const policy::DeviceLocalAccountPolicyBroker* broker =
-      service_->GetBrokerForAccount(account_id_);
+      service_->GetBrokerForUser(user_id_);
   if (broker) {
     GetStatusFromCore(broker->core(), dict);
   } else {
     dict->SetBoolean("error", true);
     dict->SetString("status",
                     policy::FormatStoreStatus(
                         policy::CloudPolicyStore::STATUS_BAD_STATE,
                         policy::CloudPolicyValidatorBase::VALIDATION_OK));
-    dict->SetString("username", account_id_);
+    dict->SetString("username", std::string());
   }
   ExtractDomainFromUsername(dict);
   dict->SetBoolean("publicAccount", true);
 }
 
 void DeviceLocalAccountPolicyStatusProvider::OnPolicyUpdated(
-    const std::string& account_id) {
-  if (account_id == account_id_)
+    const std::string& user_id) {
+  if (user_id == user_id_)
     NotifyStatusChange();
 }
 
 void DeviceLocalAccountPolicyStatusProvider::OnDeviceLocalAccountsChanged() {
   NotifyStatusChange();
 }
 #endif
 
 PolicyUIHandler::PolicyUIHandler()
     : weak_factory_(this) {
@@ skipping 158 matching lines @@
 }
 
 PolicyUI::PolicyUI(content::WebUI* web_ui) : WebUIController(web_ui) {
   web_ui->AddMessageHandler(new PolicyUIHandler);
   content::WebUIDataSource::Add(Profile::FromWebUI(web_ui),
                                 CreatePolicyUIHTMLSource());
 }
 
 PolicyUI::~PolicyUI() {
 }