2 files changed, 29 insertions, 20 deletions
diff --git a/chromium/chrome/browser/resources/accessibility/accessibility.html b/chromium/chrome/browser/resources/accessibility/accessibility.html
index 1d9b645429c..6e77f7bbfe5 100644
--- a/chromium/chrome/browser/resources/accessibility/accessibility.html
+++ b/chromium/chrome/browser/resources/accessibility/accessibility.html
@@ -111,23 +111,6 @@ found in the LICENSE file.
       <div id="label_images_secondary" class="secondary">
         Automatically labels images.
       </div>
-
-      <h2>Command line options:</h2>
-      <p>
-        Accessibility features in Chrome are off by default and enabled
-        automatically on-demand. Changes to these modes only take effect
-        until the next time Chrome is restarted.
-      </p>
-      <p>
-        To force accessibility to be enabled at launch, run Chrome with this
-        flag:
-        <pre>--force-renderer-accessibility</pre>
-      </p>
-      <p>
-        To disable accessibility, run Chrome with this flag:
-        <pre>--disable-renderer-accessibility</pre>
-      </p>
-
     </div>
     <div class="column">
       <h2>Accessibility tree viewing options:</h2>
@@ -181,14 +164,36 @@ found in the LICENSE file.
       <div id="deny_secondary" class="secondary">
         Exclude these attributes.
       </div>
+    </div>
+  </div>
 
+  <div class="columns">
+    <div class="column">
+      <h2>Command line options:</h2>
+      <p>
+        Accessibility features in Chrome are off by default and enabled
+        automatically on-demand. Changes to these modes only take effect
+        until the next time Chrome is restarted.
+      </p>
+      <p>
+        To force accessibility to be enabled at launch, run Chrome with this
+        flag:
+        <pre>--force-renderer-accessibility</pre>
+      </p>
+      <p>
+        To disable accessibility, run Chrome with this flag:
+        <pre>--disable-renderer-accessibility</pre>
+      </p>
     </div>
   </div>
 
   <h2>Chrome Native UI:</h2>
   <div id="browsers" class="list">
-    Set a delay, in milliseconds, before getting the native accessibility tree:
-    <input type="number" value="0" id="native_ui_delay"> ms
+    <label for="native-ui-delay">
+      Set a delay, in milliseconds, before getting the native accessibility
+      tree:
+    </label>
+    <input id="native-ui-delay" type="number" value="0"> ms
   </div>
 
   <h2>Pages:</h2>
diff --git a/chromium/chrome/browser/resources/accessibility/accessibility.js b/chromium/chrome/browser/resources/accessibility/accessibility.js
index b6ac8513857..d0b0b7f9b92 100644
--- a/chromium/chrome/browser/resources/accessibility/accessibility.js
+++ b/chromium/chrome/browser/resources/accessibility/accessibility.js
@@ -6,7 +6,7 @@ cr.define('accessibility', function() {
   'use strict';
 
   // Note: keep these values in sync with the values in
-  // content/common/accessibility_mode_enums.h
+  // ui/accessibility/ax_mode.h
   const AXMode = {
     kNativeAPIs: 1 << 0,
     kWebContents: 1 << 1,
@@ -14,6 +14,7 @@ cr.define('accessibility', function() {
     kScreenReader: 1 << 3,
     kHTML: 1 << 4,
     kLabelImages: 1 << 5,
+    kPDF: 1 << 6,
 
     get kAXModeWebContentsOnly() {
       return AXMode.kWebContents | AXMode.kInlineTextBoxes |
@@ -229,6 +230,7 @@ cr.define('accessibility', function() {
       row.appendChild(createModeElement(AXMode.kHTML, data, 'web'));
       row.appendChild(
           createModeElement(AXMode.kLabelImages, data, 'labelImages'));
+      row.appendChild(createModeElement(AXMode.kPDF, data, 'pdf'));
     } else {
       const siteInfo = document.createElement('span');
       siteInfo.appendChild(formatValue(data, 'name'));
@@ -313,6 +315,8 @@ cr.define('accessibility', function() {
         return 'HTML';
       case AXMode.kLabelImages:
         return 'Label images';
+      case AXMode.kPDF:
+        return 'PDF';
     }
     return 'unknown';
   }