Fix regression in msg id for ChromeVox

Regressing change
https://chromium-review.googlesource.com/c/chromium/src/+/1477455

- the msg id's get used in various other places (e.g. panel.js, command_store.js); changing them requires changing all uses of them
- the above change overwrote
https://chromium-review.googlesource.com/c/chromium/src/+/1512256

Test: make sure the ChromeVox Panel works.
Change-Id: I8074c000751ff6ab1e600615e68ca31a6686049e
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/1535002Reviewed-by: Dominic Mazzoni <dmazzoni@chromium.org>
Commit-Queue: David Tseng <dtseng@chromium.org>
Cr-Commit-Position: refs/heads/master@{#643428}

chrome/browser/resources/chromeos/chromevox/chromevox/background/options.html

@@ -220,14 +220,17 @@
   <div class="chromeos option">
     <label>
       <paper-icon-button icon="cr:expand-more"
+        aria-describedby="developer-options-label" aria-expanded="false"
         class="developer-option-icon-button"
         id="chromevox-developer-options-more"
         name="chromevox-developer-options"></paper-icon-button>
       <paper-icon-button icon="cr:expand-less"
+        aria-describedby="developer-options-label" aria-expanded="true"
         class="developer-option-icon-button"
         id="chromevox-developer-options-less"
         name="chromevox-developer-options" hidden></paper-icon-button>
-      <span class="i18n" msgid="options_developer_options">
+      <span class="i18n" msgid="options_developer_options"
+            id="developer-options-label">
         Enable developer options
       </span>
     </label>
@@ -269,9 +272,11 @@
      <div class="settings-expand-row" id="show-developer-log">
       <label>
         <paper-icon-button icon="cr:open-in-new"
+          aria-describedby="show-log-label"
           class="developer-option-icon-button" id="open-developer-log">
         </paper-icon-button>
-        <span class="i18n settings-description" msgid="options_show_log">
+        <span class="i18n settings-description" msgid="options_show_log"
+              id="show-log-label">
           Show Log</span>
         <span class="i18n settings-sub-description"
           msgid="options_show_log_key">Search + O + W</span>

chrome/browser/resources/chromeos/chromevox/cvox2/background/panel.css

@@ -2,6 +2,8 @@
  * Use of this source code is governed by a BSD-style license that can be
  * found in the LICENSE file. */
 
+@import url(https://fonts.googleapis.com/css?family=Roboto);
+
 body {
   border: 0;
   height: 35px;

chrome/browser/resources/chromeos/chromevox/cvox2/background/panel.html

@@ -6,7 +6,6 @@
 <meta charset="utf-8">
 <title class="i18n" msgid="panel_title"></title>
 
-<link href="http://fonts.googleapis.com/css?family=Droid+Sans+Mono|Roboto:400,700,700italic" rel="stylesheet" type="text/css">
 <link href="panel.css" rel="stylesheet" type="text/css">
 
 <script type="text/javascript" src="../../closure/base.js"></script>

chrome/browser/resources/chromeos/chromevox/strings/chromevox_strings.grd

@@ -201,10 +201,10 @@
       <message desc="The description of the toggleSearchWidget key. Displayed in the Options page." name="IDS_CHROMEVOX_TOGGLE_SEARCH_WIDGET">
         ChromeVox find in page
       </message>
-      <message desc="The description of the showOptionsPage key. Displayed in the Options page." name="IDS_CHROMEVOX_OPTIONS_SHOW_OPTIONS_PAGE">
+      <message desc="The description of the showOptionsPage key. Displayed in the Options page." name="IDS_CHROMEVOX_SHOW_OPTIONS_PAGE">
         Open options page
       </message>
-      <message desc="The description of the showLogPage key. Displayed in the ChromeVox panel." name="IDS_CHROMEVOX_OPTIONS_SHOW_LOG_PAGE">
+      <message desc="The description of the showLogPage key. Displayed in the ChromeVox panel." name="IDS_CHROMEVOX_SHOW_LOG_PAGE">
         Open developer log page
       </message>
       <message desc="The description of the showKbExplorerPage key; this allows users to learn about their keyboard. Displayed in the Options page." name="IDS_CHROMEVOX_SHOW_KB_EXPLORER_PAGE">