Minor PolicyStatusProvider fixes

chrome/browser/ui/webui/policy_ui_handler.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_handler.h"
 
 #include <stddef.h>
 
 #include <utility>
 
@@ skipping 62 matching lines @@
 #include "extensions/common/extension.h"
 #include "extensions/common/manifest.h"
 #include "extensions/common/manifest_constants.h"
 #endif
 
 namespace em = enterprise_management;
 
 namespace {
 
 // Strings that map from PolicySource enum to i18n string keys and their IDs.
 // Their order has to follow the order of the policy::PolicySource enum.

[Thiemo Nagel, 2016/11/22 10:55:09]

Actually I was too mechanical here.  The order needs to match that of the
PolicySource enum.

 const PolicyStringMap kPolicySources[policy::POLICY_SOURCE_COUNT] = {
+    {"sourceActiveDirectory", IDS_POLICY_SOURCE_ACTIVE_DIRECTORY},
     {"sourceEnterpriseDefault", IDS_POLICY_SOURCE_ENTERPRISE_DEFAULT},
     {"sourceCloud", IDS_POLICY_SOURCE_CLOUD},
-    {"sourceActiveDirectory", IDS_POLICY_SOURCE_ACTIVE_DIRECTORY},
     {"sourcePublicSessionOverride", IDS_POLICY_SOURCE_PUBLIC_SESSION_OVERRIDE},
     {"sourcePlatform", IDS_POLICY_SOURCE_PLATFORM},
 };
 
 // Formats the association state indicated by |data|. If |data| is NULL, the
 // state is considered to be UNMANAGED.
 base::string16 FormatAssociationState(const em::PolicyData* data) {
   if (data) {
     switch (data->state()) {
       case em::PolicyData::ACTIVE:
@@ skipping 215 matching lines @@
  public:
   explicit DeviceActiveDirectoryPolicyStatusProvider(
       policy::DeviceActiveDirectoryPolicyManager* manager);
   ~DeviceActiveDirectoryPolicyStatusProvider() override;
 
   // PolicyStatusProvider implementation.
   void GetStatus(base::DictionaryValue* dict) override;
 
  private:
   const policy::CloudPolicyStore* store_;
+
+  DISALLOW_COPY_AND_ASSIGN(DeviceActiveDirectoryPolicyStatusProvider);
 };
 #endif
 
 PolicyStatusProvider::PolicyStatusProvider() {}
 
 PolicyStatusProvider::~PolicyStatusProvider() {}
 
 void PolicyStatusProvider::SetStatusChangeCallback(
     const base::Closure& callback) {
   callback_ = callback;
@@ skipping 459 matching lines @@
 }
 
 void PolicyUIHandler::OnRefreshPoliciesDone() const {
   web_ui()->CallJavascriptFunctionUnsafe("policy.Page.reloadPoliciesDone");
 }
 
 policy::PolicyService* PolicyUIHandler::GetPolicyService() const {
   return policy::ProfilePolicyConnectorFactory::GetForBrowserContext(
              web_ui()->GetWebContents()->GetBrowserContext())->policy_service();
 }