Add an enrolling state for consumer management section in settings page.

chrome/browser/ui/webui/options/browser_options_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/options/browser_options_handler.h"
 
 #include <string>
 #include <vector>
 
 #include "apps/app_window.h"
@@ skipping 89 matching lines @@
 
 #if defined(OS_CHROMEOS)
 #include "ash/ash_switches.h"
 #include "ash/desktop_background/user_wallpaper_delegate.h"
 #include "ash/magnifier/magnifier_constants.h"
 #include "ash/shell.h"
 #include "chrome/browser/chromeos/accessibility/accessibility_util.h"
 #include "chrome/browser/chromeos/chromeos_utils.h"
 #include "chrome/browser/chromeos/login/users/wallpaper/wallpaper_manager.h"
 #include "chrome/browser/chromeos/policy/browser_policy_connector_chromeos.h"
+#include "chrome/browser/chromeos/policy/consumer_management_service.h"

[bartfab (slow), 2014/08/20 14:40:02]

Nit: Already included by the header file.

[davidyu, 2014/08/21 09:40:29]

Done.

 #include "chrome/browser/chromeos/profiles/profile_helper.h"
 #include "chrome/browser/chromeos/reset/metrics.h"
 #include "chrome/browser/chromeos/settings/cros_settings.h"
-#include "chrome/browser/chromeos/settings/device_settings_service.h"
 #include "chrome/browser/chromeos/system/timezone_util.h"
 #include "chrome/browser/policy/profile_policy_connector.h"
 #include "chrome/browser/policy/profile_policy_connector_factory.h"
 #include "chrome/browser/ui/browser_window.h"
 #include "chromeos/dbus/dbus_thread_manager.h"
 #include "chromeos/dbus/power_manager_client.h"
 #include "components/policy/core/common/policy_map.h"
 #include "components/policy/core/common/policy_namespace.h"
 #include "components/policy/core/common/policy_service.h"
 #include "components/user_manager/user.h"
 #include "components/user_manager/user_manager.h"
 #include "policy/policy_constants.h"
-#include "policy/proto/device_management_backend.pb.h"
 #include "ui/gfx/image/image_skia.h"
 #endif  // defined(OS_CHROMEOS)
 
 #if defined(OS_WIN)
 #include "chrome/browser/extensions/settings_api_helpers.h"
 #include "chrome/installer/util/auto_launch_util.h"
 #include "content/public/browser/browser_url_handler.h"
 #endif  // defined(OS_WIN)
 
 #if defined(ENABLE_SERVICE_DISCOVERY)
@@ skipping 267 matching lines @@
     { "autoclickDelayShort",
       IDS_OPTIONS_SETTINGS_ACCESSIBILITY_AUTOCLICK_DELAY_SHORT },
     { "autoclickDelayLong",
       IDS_OPTIONS_SETTINGS_ACCESSIBILITY_AUTOCLICK_DELAY_LONG },
     { "autoclickDelayVeryLong",
       IDS_OPTIONS_SETTINGS_ACCESSIBILITY_AUTOCLICK_DELAY_VERY_LONG },
     { "consumerManagementDescription",
       IDS_OPTIONS_CONSUMER_MANAGEMENT_DESCRIPTION },
     { "consumerManagementEnrollButton",
       IDS_OPTIONS_CONSUMER_MANAGEMENT_ENROLL_BUTTON },
+    { "consumerManagementEnrollingButton",
+      IDS_OPTIONS_CONSUMER_MANAGEMENT_ENROLLING_BUTTON },
     { "consumerManagementUnenrollButton",
       IDS_OPTIONS_CONSUMER_MANAGEMENT_UNENROLL_BUTTON },
+    { "consumerManagementUnenrollingButton",
+      IDS_OPTIONS_CONSUMER_MANAGEMENT_UNENROLLING_BUTTON },
     { "deviceControlTitle", IDS_OPTIONS_DEVICE_CONTROL_SECTION_TITLE },
     { "enableContentProtectionAttestation",
       IDS_OPTIONS_ENABLE_CONTENT_PROTECTION_ATTESTATION },
     { "factoryResetHeading", IDS_OPTIONS_FACTORY_RESET_HEADING },
     { "factoryResetTitle", IDS_OPTIONS_FACTORY_RESET },
     { "factoryResetRestart", IDS_OPTIONS_FACTORY_RESET_BUTTON },
     { "factoryResetDataRestart", IDS_RELAUNCH_BUTTON },
     { "factoryResetWarning", IDS_OPTIONS_FACTORY_RESET_WARNING },
     { "factoryResetHelpUrl", IDS_FACTORY_RESET_HELP_URL },
     { "changePicture", IDS_OPTIONS_CHANGE_PICTURE },
@@ skipping 200 matching lines @@
       "easyUnlockAllowed",
       EasyUnlockService::Get(Profile::FromWebUI(web_ui()))->IsAllowed());
   values->SetString("easyUnlockLearnMoreURL", chrome::kEasyUnlockLearnMoreUrl);
 
 #if defined(OS_CHROMEOS)
   values->SetBoolean(
       "consumerManagementEnabled",
       CommandLine::ForCurrentProcess()->HasSwitch(
           chromeos::switches::kEnableConsumerManagement));
 
-  const enterprise_management::PolicyData* policy_data =
-      chromeos::DeviceSettingsService::Get()->policy_data();
-  values->SetBoolean(
-      "consumerManagementEnrolled",
-      policy_data &&
-      policy_data->management_mode() ==
-          enterprise_management::PolicyData::CONSUMER_MANAGED);
-
   RegisterTitle(values, "thirdPartyImeConfirmOverlay",
                 IDS_OPTIONS_SETTINGS_LANGUAGES_THIRD_PARTY_WARNING_TITLE);
 #endif
 
   values->SetBoolean("showSetDefault", ShouldShowSetDefaultBrowser());
 
   values->SetBoolean("allowAdvancedSettings", ShouldAllowAdvancedSettings());
 
   values->SetBoolean("websiteSettingsManagerEnabled",
                      CommandLine::ForCurrentProcess()->HasSwitch(
@@ skipping 113 matching lines @@
           &BrowserOptionsHandler::HandleRefreshExtensionControlIndicators,
           base::Unretained(this)));
 #endif  // defined(OS_WIN)
 }
 
 void BrowserOptionsHandler::Uninitialize() {
   registrar_.RemoveAll();
 #if defined(OS_WIN)
   ExtensionRegistry::Get(Profile::FromWebUI(web_ui()))->RemoveObserver(this);
 #endif
+#if defined(OS_CHROMEOS)
+  g_browser_process->platform_part()->browser_policy_connector_chromeos()->

[bartfab (slow), 2014/08/20 14:40:02]

Nit: #include "chrome/browser/browser_process_platform_part.h"

[davidyu, 2014/08/21 09:40:29]

Done.

+      GetConsumerManagementService()->RemoveObserver(this);
+#endif
 }
 
 void BrowserOptionsHandler::OnStateChanged() {
   UpdateSyncState();
 }
 
 void BrowserOptionsHandler::GoogleSigninSucceeded(const std::string& username,
                                                   const std::string& password) {
   OnStateChanged();
 }
@@ skipping 160 matching lines @@
   OnAccountPictureManagedChanged(
       policy::ProfilePolicyConnectorFactory::GetForProfile(profile)->
           policy_service()->GetPolicies(
               policy::PolicyNamespace(policy::POLICY_DOMAIN_CHROME,
                                       std::string()))
              .Get(policy::key::kUserAvatarImage));
 
   OnWallpaperManagedChanged(
       chromeos::WallpaperManager::Get()->IsPolicyControlled(
           user_manager::UserManager::Get()->GetActiveUser()->email()));
+
+  policy::ConsumerManagementService* consumer_management_service =
+      g_browser_process->platform_part()->browser_policy_connector_chromeos()->
+          GetConsumerManagementService();
+  OnConsumerManagementEnrollmentStateChanged(consumer_management_service);
+  consumer_management_service->AddObserver(this);
 #endif
 }
 
 // static
 void BrowserOptionsHandler::CheckAutoLaunch(
     base::WeakPtr<BrowserOptionsHandler> weak_this,
     const base::FilePath& profile_path) {
 #if defined(OS_WIN)
   DCHECK_CURRENTLY_ON(BrowserThread::FILE);
 
@@ skipping 506 matching lines @@
 }
 
 void BrowserOptionsHandler::OnPowerwashDialogShow(
      const base::ListValue* args) {
   UMA_HISTOGRAM_ENUMERATION(
       "Reset.ChromeOS.PowerwashDialogShown",
       chromeos::reset::DIALOG_FROM_OPTIONS,
       chromeos::reset::DIALOG_VIEW_TYPE_SIZE);
 }
 
+void BrowserOptionsHandler::OnConsumerManagementEnrollmentStateChanged(
+    policy::ConsumerManagementService* service) {
+  std::string state;
+  if (service->IsEnrolled()) {

[bartfab (slow), 2014/08/20 14:40:03]

Nit: No need for curly braces.

[davidyu, 2014/08/21 09:40:29]

Done.

+    state = service->IsUnenrolling() ? "unenrolling" : "enrolled";

[bartfab (slow), 2014/08/20 14:40:02]

I would not be surprised if this nested conditional turned up elsewhere as well,
because other methods also want to distinguish the four states
unenrolled/enrolled/unenrolling/enrolling. How about making an enum for these
and having OnConsumerManagementEnrollmentStateChanged() return this enum instead
of IsEnrolled(), IsUnenrolling() and IsEnrolling()?

[davidyu, 2014/08/21 09:40:30]

Done.

+  } else {
+    state = service->IsEnrolling() ? "enrolling" : "unenrolled";
+  }
+  web_ui()->CallJavascriptFunction(
+      "BrowserOptions.setConsumerManagementEnrollmentState",
+      base::StringValue(state));
+}
+
 #endif  // defined(OS_CHROMEOS)
 
 void BrowserOptionsHandler::UpdateSyncState() {
   web_ui()->CallJavascriptFunction("BrowserOptions.updateSyncState",
                                    *GetSyncStateDictionary());
 }
 
 void BrowserOptionsHandler::OnSigninAllowedPrefChange() {
   UpdateSyncState();
 }
@@ skipping 390 matching lines @@
   extension = extensions::GetExtensionOverridingProxy(
       Profile::FromWebUI(web_ui()));
   AppendExtensionData("proxy", extension, &extension_controlled);
 
   web_ui()->CallJavascriptFunction("BrowserOptions.toggleExtensionIndicators",
                                    extension_controlled);
 #endif  // defined(OS_WIN)
 }
 
 }  // namespace options