Switch to selected 8-dot braille table in email and url text fields

chrome/browser/resources/chromeos/chromevox/braille/braille_translator_manager.js

 // Copyright 2014 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 /**
  * @fileoverview Keeps track of the current braille translators.
  */
 
 goog.provide('cvox.BrailleTranslatorManager');
 
@@ skipping 64 matching lines @@
    * @param {function()} listener The listener.
    */
   addChangeListener: function(listener) {
     this.changeListeners_.push(listener);
   },
 
   /**
    * Refreshes the braille translator(s) used for input and output.  This
    * should be called when something has changed (such as a preference) to
    * make sure that the correct translator is used.
+   * @param {string} brailleTable The table for this translator to use.
+   * @param {string=} opt_brailleTable8 Optionally specify an uncontracted
+   * table.
    */
-  refresh: function() {
+  refresh: function(brailleTable, opt_brailleTable8) {
     var tables = this.tables_;
     if (tables.length == 0)
       return;
 
-    // First, see if we have a braille table set previously.
-    var table = cvox.BrailleTable.forId(tables, localStorage['brailleTable']);
+    // Look for the table requested.
+    var table = cvox.BrailleTable.forId(tables, brailleTable);
     if (!table) {
       // Match table against current locale.
       var currentLocale = chrome.i18n.getMessage('@@ui_locale').split(/[_-]/);
       var major = currentLocale[0];
       var minor = currentLocale[1];
       var firstPass = tables.filter(function(table) {
         return table.locale.split(/[_-]/)[0] == major;
       });
       if (firstPass.length > 0) {
         table = firstPass[0];
         if (minor) {
           var secondPass = firstPass.filter(function(table) {
             return table.locale.split(/[_-]/)[1] == minor;
           });
           if (secondPass.length > 0)
             table = secondPass[0];
         }
       }
     }
     if (!table)
       table = cvox.BrailleTable.forId(tables, 'en-US-comp8');
 
-    // TODO(plundblad): Only update when user explicitly selects a table
-    // so that switching locales changes table by default.  crbug.com/441206.
-    localStorage['brailleTable'] = table.id;
-    if (!localStorage['brailleTable6'])
-      localStorage['brailleTable6'] = 'en-US-g1';
-    if (!localStorage['brailleTable8'])
-      localStorage['brailleTable8'] = 'en-US-comp8';
-
-    if (table.dots == '6') {
-      localStorage['brailleTableType'] = 'brailleTable6';
-      localStorage['brailleTable6'] = table.id;
-    } else {
-      localStorage['brailleTableType'] = 'brailleTable8';
-      localStorage['brailleTable8'] = table.id;
-    }
-
     // If the user explicitly set an 8 dot table, use that when looking
     // for an uncontracted table.  Otherwise, use the current table and let
     // getUncontracted find an appropriate corresponding table.
-    var table8Dot = cvox.BrailleTable.forId(tables,
-                                            localStorage['brailleTable8']);
+    var table8Dot = opt_brailleTable8 ?
+        cvox.BrailleTable.forId(tables, opt_brailleTable8) : null;
     var uncontractedTable = cvox.BrailleTable.getUncontracted(
         tables, table8Dot || table);
 
     var newDefaultTableId = table.id;
     var newUncontractedTableId = table.id === uncontractedTable.id ?
         null : uncontractedTable.id;
     if (newDefaultTableId === this.defaultTableId_ &&
         newUncontractedTableId === this.uncontractedTableId_) {
       return;
     }
@@ skipping 47 matching lines @@
   },
 
   /**
    * Asynchronously fetches the list of braille tables and refreshes the
    * translators when done.
    * @private
    */
   fetchTables_: function() {
     cvox.BrailleTable.getAll(function(tables) {
       this.tables_ = tables;
-      this.refresh();
+
+      // Initial refresh; set options from user preferences.
+      this.refresh(localStorage['brailleTable'], localStorage['brailleTable8']);
     }.bind(this));
   },
 
   /**
    * Loads the liblouis instance by attaching it to the document.
    * @private
    */
   loadLiblouis_: function() {
     // Cast away nullability.  When the document is loaded, it will always
     // have a body.
@@ skipping 10 matching lines @@
   },
 
   /**
    * @return {!Array<cvox.BrailleTable.Table>} The currently loaded braille
    *     tables, or an empty array if they are not yet loaded.
    */
   getTablesForTest: function() {
     return this.tables_;
   }
 };