Remove subtitle from Reset settings trigger

With the introduction of the 3p removal trigger, the concern is that
subtitles make the card too heavy, so we are simply removing them.

Bug: 816666
Cq-Include-Trybots: master.tryserver.chromium.linux:closure_compilation
Change-Id: I48fc29fac751c6fe54a3e7c87567d14bcf7f4f6c
Reviewed-on: https://chromium-review.googlesource.com/938625
Commit-Queue: Fabio Tirelo <ftirelo@chromium.org>
Reviewed-by: Demetrios Papadopoulos <dpapad@chromium.org>
Cr-Commit-Position: refs/heads/master@{#547900}

chrome/app/settings_strings.grdp

@@ -2302,12 +2302,12 @@
   <message name="IDS_SETTINGS_RESET" desc="Title for an item in the 'Reset and clean up' section of Chrome Settings. If the user clicks this option, browser settings will be returned to their default values, after a confirmation by the user." meaning="Chrome Cleanup feature. Try to use the same translation for 'Reset' in 'Reset and cleanup' string.">
     Reset settings
   </message>
+  <message name="IDS_SETTINGS_RESET_SETTINGS_TRIGGER" desc="The label describing the 'reset profile setting' feature">
+    Restore settings to their original defaults
+  </message>
   <message name="IDS_SETTINGS_RESET_AUTOMATED_DIALOG_TITLE" desc="The title of the dialog informing the user that automated resetting of some settings occurred.">
     Some settings were reset
   </message>
-  <message name="IDS_SETTINGS_RESET_PROFILE_SETTINGS_DESCRIPTION" desc="The label describing the 'reset profile setting' feature">
-    Restore settings to their original defaults
-  </message>
   <message name="IDS_SETTINGS_RESET_BANNER_TEXT" desc="The text to show in a banner at the top of the chrome://settings page. The banner is displayed when Chrome detects that some settings have been tampered with and were reset to factory defaults.">
     Chrome detected that some of your settings were corrupted by another program and reset them to their original defaults.
   </message>

chrome/browser/resources/settings/reset_page/reset_page.html

@@ -25,17 +25,12 @@
     <style include="settings-shared"></style>
     <settings-animated-pages id="reset-pages" section="reset">
       <neon-animatable route-path="default">
-        <div class="settings-box first two-line" id="resetProfile"
+        <div class="settings-box first" id="resetProfile"
             on-click="onShowResetProfileDialog_" actionable>
-          <div class="start">
-            $i18n{resetTrigger}
-            <div class="secondary" id="resetProfileSecondary">
-              $i18n{resetTriggerDescription}
-            </div>
-          </div>
+          <div id="resetProfileTrigger" class="start">$i18n{resetTrigger}</div>
           <paper-icon-button-light class="subpage-arrow">
             <button id="resetProfileArrow" aria-label="$i18n{resetTrigger}"
-                aria-describedby="resetProfileSecondary"></button>
+                aria-describedby="resetProfileTrigger"></button>
           </paper-icon-button-light>
         </div>
         <!-- Keep a single instance of reset-profile-dialog on purpose, to

chrome/browser/resources/settings/reset_page/reset_profile_dialog.html

@@ -41,7 +41,7 @@
         </paper-button>
         <paper-button class="action-button" on-click="onResetTap_"
             id="reset" disabled="[[clearingInProgress_]]">
-          $i18n{resetPageCommit}
+          $i18n{resetDialogCommit}
         </paper-button>
       </div>
       <div slot="footer">

chrome/browser/resources/settings/reset_page/reset_profile_dialog.js

@@ -65,7 +65,7 @@ Polymer({
       return loadTimeData.getStringF(
           'triggeredResetPageTitle', this.triggeredResetToolName_);
     }
-    return loadTimeData.getStringF('resetTrigger');
+    return loadTimeData.getStringF('resetDialogCommit');
   },
 
   /** @override */

chrome/browser/ui/webui/settings/md_settings_localized_strings_provider.cc

@@ -924,14 +924,12 @@ void AddResetStrings(content::WebUIDataSource* html_source) {
 #else
     {"resetPageTitle", IDS_SETTINGS_RESET},
 #endif
-    {"resetTrigger", IDS_SETTINGS_RESET},
-    {"resetTriggerDescription",
-     IDS_SETTINGS_RESET_PROFILE_SETTINGS_DESCRIPTION},
+    {"resetTrigger", IDS_SETTINGS_RESET_SETTINGS_TRIGGER},
     {"resetPageExplanation", IDS_RESET_PROFILE_SETTINGS_EXPLANATION},
     {"triggeredResetPageExplanation",
      IDS_TRIGGERED_RESET_PROFILE_SETTINGS_EXPLANATION},
     {"triggeredResetPageTitle", IDS_TRIGGERED_RESET_PROFILE_SETTINGS_TITLE},
-    {"resetPageCommit", IDS_RESET_PROFILE_SETTINGS_COMMIT_BUTTON},
+    {"resetDialogCommit", IDS_SETTINGS_RESET},
     {"resetPageFeedback", IDS_SETTINGS_RESET_PROFILE_FEEDBACK},
 #if defined(OS_CHROMEOS)
     {"powerwashTitle", IDS_SETTINGS_FACTORY_RESET},