Make chromeos::MagifierType an enum class

Bug: 1101837
Change-Id: I21f981c1b5c154ca68d3e310653a9485d7e903ce
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2617847
Commit-Queue: James Cook <jamescook@chromium.org>
Owners-Override: James Cook <jamescook@chromium.org>
Reviewed-by: James Cook <jamescook@chromium.org>
Cr-Commit-Position: refs/heads/master@{#843102}

chrome/browser/chromeos/accessibility/magnifier_type.h

@@ -8,14 +8,12 @@
 namespace chromeos {
 
 // Note: Do not change these values; UMA and prefs depend on them.
-enum MagnifierType {
-  MAGNIFIER_DISABLED = 0,  // Used by enterprise policy.
-  MAGNIFIER_FULL = 1,
-  MAGNIFIER_DOCKED = 2,
+enum class MagnifierType {
+  kDisabled = 0,  // Used by enterprise policy.
+  kFull = 1,
+  kDocked = 2,
   // Never shipped. Deprioritized in 2013. http://crbug.com/170850
-  // MAGNIFIER_PARTIAL = 2,
-  // TODO(afakhy): Consider adding Docked Magnifier type (shipped in M66) for
-  // policy control.
+  // kPartial = 2,
 };
 
 }  // namespace chromeos

chrome/browser/chromeos/policy/configuration_policy_handler_chromeos.cc

@@ -334,10 +334,11 @@ void PinnedLauncherAppsPolicyHandler::ApplyList(base::Value filtered_list,
 }
 
 ScreenMagnifierPolicyHandler::ScreenMagnifierPolicyHandler()
-    : IntRangePolicyHandlerBase(key::kScreenMagnifierType,
-                                chromeos::MAGNIFIER_DISABLED,
-                                chromeos::MAGNIFIER_DOCKED,
-                                false) {}
+    : IntRangePolicyHandlerBase(
+          key::kScreenMagnifierType,
+          static_cast<int>(chromeos::MagnifierType::kDisabled),
+          static_cast<int>(chromeos::MagnifierType::kDocked),
+          false) {}
 
 ScreenMagnifierPolicyHandler::~ScreenMagnifierPolicyHandler() {
 }
@@ -348,10 +349,12 @@ void ScreenMagnifierPolicyHandler::ApplyPolicySettings(
   const base::Value* value = policies.GetValue(policy_name());
   int value_in_range;
   if (value && EnsureInRange(value, &value_in_range, nullptr)) {
-    prefs->SetBoolean(ash::prefs::kAccessibilityScreenMagnifierEnabled,
-                      value_in_range == chromeos::MAGNIFIER_FULL);
-    prefs->SetBoolean(ash::prefs::kDockedMagnifierEnabled,
-                      value_in_range == chromeos::MAGNIFIER_DOCKED);
+    prefs->SetBoolean(
+        ash::prefs::kAccessibilityScreenMagnifierEnabled,
+        value_in_range == static_cast<int>(chromeos::MagnifierType::kFull));
+    prefs->SetBoolean(
+        ash::prefs::kDockedMagnifierEnabled,
+        value_in_range == static_cast<int>(chromeos::MagnifierType::kDocked));
   }
 }
 

chrome/browser/policy/accessibility_policy_browsertest.cc

@@ -123,7 +123,8 @@ IN_PROC_BROWSER_TEST_F(AccessibilityPolicyTest, ScreenMagnifierTypeFull) {
   PolicyMap policies;
   policies.Set(key::kScreenMagnifierType, POLICY_LEVEL_MANDATORY,
                POLICY_SCOPE_USER, POLICY_SOURCE_CLOUD,
-               base::Value(chromeos::MAGNIFIER_FULL), nullptr);
+               base::Value(static_cast<int>(chromeos::MagnifierType::kFull)),
+               nullptr);
   UpdateProviderPolicy(policies);
   EXPECT_TRUE(magnification_manager->IsMagnifierEnabled());
 
@@ -145,7 +146,8 @@ IN_PROC_BROWSER_TEST_F(AccessibilityPolicyTest, ScreenMagnifierTypeDocked) {
   PolicyMap policies;
   policies.Set(key::kScreenMagnifierType, POLICY_LEVEL_MANDATORY,
                POLICY_SCOPE_USER, POLICY_SOURCE_CLOUD,
-               base::Value(chromeos::MAGNIFIER_DOCKED), nullptr);
+               base::Value(static_cast<int>(chromeos::MagnifierType::kDocked)),
+               nullptr);
   UpdateProviderPolicy(policies);
   EXPECT_TRUE(magnification_manager->IsDockedMagnifierEnabled());
 

chrome/browser/policy/configuration_policy_handler_list_factory.cc

@@ -1672,10 +1672,12 @@ std::unique_ptr<ConfigurationPolicyHandlerList> BuildHandlerList(
       key::kUptimeLimit, prefs::kUptimeLimit, 3600, INT_MAX, true));
   handlers->AddHandler(std::make_unique<IntRangePolicyHandler>(
       key::kDeviceLoginScreenDefaultScreenMagnifierType, nullptr,
-      chromeos::MAGNIFIER_DISABLED, chromeos::MAGNIFIER_DOCKED, false));
+      static_cast<int>(chromeos::MagnifierType::kDisabled),
+      static_cast<int>(chromeos::MagnifierType::kDocked), false));
   handlers->AddHandler(std::make_unique<IntRangePolicyHandler>(
       key::kDeviceLoginScreenScreenMagnifierType, nullptr,
-      chromeos::MAGNIFIER_DISABLED, chromeos::MAGNIFIER_DOCKED, false));
+      static_cast<int>(chromeos::MagnifierType::kDisabled),
+      static_cast<int>(chromeos::MagnifierType::kDocked), false));
   handlers->AddHandler(
       std::make_unique<ScreenBrightnessPercentPolicyHandler>(chrome_schema));
   handlers->AddHandler(