[DevicePage] Rename "Enable reverse scrolling" strings

Renames "Reverse scrolling" to "Enable reverse scrolling" on the
settings page for Mouse and Touchpad, as per the bug.

Fixed: 1132398
Change-Id: I173fe20f95a21c3909e8fa766cc8bfaac62258b0
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2434211Reviewed-by: Kyle Horimoto <khorimoto@chromium.org>
Commit-Queue: Daniel Classon <dclasson@google.com>
Cr-Commit-Position: refs/heads/master@{#811504}

chrome/app/os_settings_strings.grdp

@@ -498,14 +498,11 @@
 
   <!-- Device Page (OS Settings) -->
   <message name="IDS_OS_SETTINGS_TOUCHPAD_REVERSE_SCROLL_LABEL">
-    Reverse scrolling <ph name="LINK_BEGIN">&lt;a&gt;</ph>Learn more<ph name="LINK_END">&lt;/a&gt;</ph>
+    Enable reverse scrolling <ph name="LINK_BEGIN">&lt;a&gt;</ph>Learn more<ph name="LINK_END">&lt;/a&gt;</ph>
   </message>
   <message name="IDS_SETTINGS_DEVICE_TITLE" desc="Name of the settings page which displays device and peripheral settings.">
     Device
   </message>
-  <message name="IDS_SETTINGS_SCROLL_LABEL" desc="In Device Settings, the title above the radio buttons to choose the scrolling behavior.">
-    Scrolling
-  </message>
 
   <!-- Personalization Page (OS settings) -->
   <message name="IDS_OS_SETTINGS_PERSONALIZATION" desc="Name of the OS settings page which displays personalization preferences.">
@@ -1641,7 +1638,7 @@
     Swap primary mouse button
   </message>
   <message name="IDS_SETTINGS_MOUSE_REVERSE_SCROLL_LABEL" desc="In Device Settings, the text next to the checkbox to set reverse scrolling.">
-    Reverse scrolling
+    Enable reverse scrolling <ph name="LINK_BEGIN">&lt;a&gt;</ph>Learn more<ph name="LINK_END">&lt;/a&gt;</ph>
   </message>
   <message name="IDS_SETTINGS_MOUSE_ACCELERATION_LABEL" desc="In Device Settings, the text next to the checkbox to disable mouse acceleration.">
     Enable mouse acceleration

chrome/app/os_settings_strings_grdp/IDS_OS_SETTINGS_TOUCHPAD_REVERSE_SCROLL_LABEL.png.sha1

+d8b70907a64d121e2063d6faf229295b8e56089f
\ No newline at end of file

chrome/app/os_settings_strings_grdp/IDS_SETTINGS_MOUSE_REVERSE_SCROLL_LABEL.png.sha1

+a5951a0be1d8db1eed35d1fc22331b1450bcf4f0
\ No newline at end of file

chrome/browser/resources/settings/chromeos/device_page/pointers.html

@@ -87,12 +87,22 @@
             </settings-slider>
           </div>
         </template>
-        <settings-toggle-button id="mouseReverseScroll"
-            class="hr"
-            pref="{{prefs.settings.mouse.reverse_scroll}}"
-            label="$i18n{mouseReverseScroll}"
-            deep-link-focus-id$="[[Setting.kMouseReverseScrolling]]">
-        </settings-toggle-button>
+        <div class="settings-box" id="mouseReverseScrollRow"
+             on-click="onMouseReverseScrollRowClicked_">
+          <div class="start settings-box-text">
+            <settings-localized-link
+                on-click="onLearnMoreLinkClicked_"
+                id="enableMouseReverseScrollingLabel"
+                localized-string="$i18n{mouseReverseScroll}"
+                link-url="$i18n{naturalScrollLearnMoreLink}">
+            </settings-localized-link>
+          </div>
+          <cr-toggle id="mouseReverseScroll"
+              checked="{{prefs.settings.mouse.reverse_scroll.value}}"
+              aria-labelledby="enableMouseReverseScrollingLabel"
+              deep-link-focus-id$="[[Setting.kMouseReverseScrolling]]">
+          </cr-toggle>
+        </div>
       </div>
     </div>
     <div id="touchpad" hidden$="[[!hasTouchpad]]">
@@ -152,7 +162,7 @@
           </div>
         </template>
         <div class="settings-box" id="reverseScrollRow"
-             on-click="onReverseScrollRowClicked_">
+             on-click="onTouchpadReverseScrollRowClicked_">
           <div class="start settings-box-text">
             <settings-localized-link
                 on-click="onLearnMoreLinkClicked_"

chrome/browser/resources/settings/chromeos/device_page/pointers.js

@@ -145,7 +145,14 @@ Polymer({
   },
 
   /** @private */
-  onReverseScrollRowClicked_: function() {
+  onMouseReverseScrollRowClicked_: function() {
+    this.setPrefValue(
+        'settings.mouse.reverse_scroll',
+        !this.getPref('settings.mouse.reverse_scroll').value);
+  },
+
+  /** @private */
+  onTouchpadReverseScrollRowClicked_: function() {
     this.setPrefValue(
         'settings.touchpad.natural_scroll',
         !this.getPref('settings.touchpad.natural_scroll').value);

chrome/browser/ui/webui/settings/chromeos/device_section.cc

@@ -787,7 +787,6 @@ DeviceSection::~DeviceSection() {
 void DeviceSection::AddLoadTimeData(content::WebUIDataSource* html_source) {
   static constexpr webui::LocalizedString kDeviceStrings[] = {
       {"devicePageTitle", IDS_SETTINGS_DEVICE_TITLE},
-      {"scrollLabel", IDS_SETTINGS_SCROLL_LABEL},
       {"touchPadScrollLabel", IDS_OS_SETTINGS_TOUCHPAD_REVERSE_SCROLL_LABEL},
   };
   AddLocalizedStringsBulk(html_source, kDeviceStrings);