Backed out changeset b05c8f63d8a2 (bug 1319844)
authorCarsten "Tomcat" Book <cbook@mozilla.com>
Mon, 28 Nov 2016 15:56:44 +0100
changeset 324449 030a4cd9e71f7d4a5d812958d205a0198aa2340e
parent 324448 7b6efd0556202afe260177485214d727377b446e
child 324450 670ad168fb708a7eca83480419f6206833b2566e
push id24
push usermaklebus@msu.edu
push dateTue, 20 Dec 2016 03:11:33 +0000
bugs1319844
milestone53.0a1
backs outb05c8f63d8a2bbcbc95c40cb462f80d4a962be2d
Backed out changeset b05c8f63d8a2 (bug 1319844)
browser/modules/LaterRun.jsm
dom/console/ConsoleAPIStorage.js
toolkit/content/widgets/videocontrols.xml
--- a/browser/modules/LaterRun.jsm
+++ b/browser/modules/LaterRun.jsm
@@ -5,16 +5,20 @@
 "use strict";
 
 const { classes: Cc, interfaces: Ci, utils: Cu } = Components;
 
 this.EXPORTED_SYMBOLS = ["LaterRun"];
 
 Cu.import("resource://gre/modules/Preferences.jsm");
 Cu.import("resource://gre/modules/Services.jsm");
+Cu.import("resource://gre/modules/XPCOMUtils.jsm");
+XPCOMUtils.defineLazyModuleGetter(this, "setInterval", "resource://gre/modules/Timer.jsm");
+XPCOMUtils.defineLazyModuleGetter(this, "clearInterval", "resource://gre/modules/Timer.jsm");
+XPCOMUtils.defineLazyModuleGetter(this, "RecentWindow", "resource://gre/modules/RecentWindow.jsm");
 
 const kEnabledPref = "browser.laterrun.enabled";
 const kPagePrefRoot = "browser.laterrun.pages.";
 // Number of sessions we've been active in
 const kSessionCountPref = "browser.laterrun.bookkeeping.sessionCount";
 // Time the profile was created at:
 const kProfileCreationTime = "browser.laterrun.bookkeeping.profileCreationTime";
 
--- a/dom/console/ConsoleAPIStorage.js
+++ b/dom/console/ConsoleAPIStorage.js
@@ -26,18 +26,17 @@ const CONSOLEAPISTORAGE_CID = Components
  * display the cached messages when it opens for the active tab.
  *
  * ConsoleAPI messages are stored as they come from the ConsoleAPI code, with
  * all their properties. They are kept around until the inner window object that
  * created the messages is destroyed. Messages are indexed by the inner window
  * ID.
  *
  * Usage:
- *    let ConsoleAPIStorage = Cc["@mozilla.org/consoleAPI-storage;1"]
- *                              .getService(Ci.nsIConsoleAPIStorage);
+ *    Cu.import("resource://gre/modules/ConsoleAPIStorage.jsm");
  *
  *    // Get the cached events array for the window you want (use the inner
  *    // window ID).
  *    let events = ConsoleAPIStorage.getEvents(innerWindowID);
  *    events.forEach(function(event) { ... });
  *
  *    // Clear the events for the given inner window ID.
  *    ConsoleAPIStorage.clearEvents(innerWindowID);
--- a/toolkit/content/widgets/videocontrols.xml
+++ b/toolkit/content/widgets/videocontrols.xml
@@ -2066,17 +2066,17 @@
               this.Utils.video.play();
             this.TouchUtils.toggleControls();
           }
         </handler>
     </handlers>
 
   </binding>
 
-  <binding id="touchControlsGonk" extends="chrome://global/content/bindings/videocontrols.xml#touchControls">
+  <binding id="touchControlsGonk" extends="chrome://global/content/bindings/videoControls.xml#touchControls">
     <implementation>
       <constructor>
           this.isGonk = true;
       </constructor>
     </implementation>
   </binding>
 
   <binding id="noControls">