Revert of Make ChromeVox Next a setting in options page.

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

 // Copyright 2015 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 The ChromeVox panel and menus.
  */
 
 goog.provide('Panel');
 
@@ skipping 278 matching lines @@
   // Insert items from the bindings into the menus.
   sortedBindings.forEach(goog.bind(function(binding) {
     var category = cvox.CommandStore.categoryForCommand(binding.command);
     var menu = category ? categoryToMenu[category] : null;
     if (binding.title && menu) {
       menu.addMenuItem(
           binding.title,
           binding.keySeq,
           function() {
             var bkgnd =
-                chrome.extension.
-                getBackgroundPage()['ChromeVoxState']['instance'];
+                chrome.extension.getBackgroundPage()['global']['backgroundObj'];
             bkgnd['onGotCommand'](binding.command);
           });
     }
   }, this));
 
   // Add all open tabs to the Tabs menu.
   bkgnd.chrome.windows.getLastFocused(function(lastFocusedWindow) {
     bkgnd.chrome.windows.getAll({'populate': true}, function(windows) {
       for (var i = 0; i < windows.length; i++) {
         var tabs = windows[i].tabs;
@@ skipping 227 matching lines @@
       Panel.searchInput_.value = '';
     }
   }
 };
 
 /**
  * Open the ChromeVox Options.
  */
 Panel.onOptions = function() {
   var bkgnd =
-      chrome.extension.getBackgroundPage()['ChromeVoxState']['instance'];
+      chrome.extension.getBackgroundPage()['global']['backgroundObj'];
   bkgnd['showOptionsPage']();
   window.location = '#';
 };
 
 /**
  * Exit ChromeVox.
  */
 Panel.onClose = function() {
   window.location = '#close';
 };
@@ skipping 10 matching lines @@
 
 /**
  * Close the menus and restore focus to the page. If a menu item's callback
  * was queued, execute it once focus is restored.
  */
 Panel.closeMenusAndRestoreFocus = function() {
   // Make sure we're not in full-screen mode.
   window.location = '#';
 
   var bkgnd =
-      chrome.extension.getBackgroundPage()['ChromeVoxState']['instance'];
+      chrome.extension.getBackgroundPage()['global']['backgroundObj'];
   bkgnd['endExcursion'](Panel.pendingCallback_);
 };
 
 window.addEventListener('load', function() {
   Panel.init();
 }, false);
 
 window.addEventListener('hashchange', function() {
   if (location.hash == '#fullscreen' || location.hash == '#focus') {
     this.originalStickyState_ = cvox.ChromeVox.isStickyPrefOn;
     cvox.ChromeVox.isStickyPrefOn = false;
   } else {
     cvox.ChromeVox.isStickyPrefOn = this.originalStickyState_;
   }
 }, false);