Commit 09c6670b authored by Matt Brubeck's avatar Matt Brubeck
Browse files

Merge last green changeset from inbound to mozilla-central

parents 43f76b98 3ae43ae2

aclocal.m4

+1 −0
Original line number Diff line number Diff line
@@ -19,6 +19,7 @@ builtin(include, build/autoconf/gcc-pr49911.m4)dnl 
builtin(include, build/autoconf/frameptr.m4)dnl

builtin(include, build/autoconf/compiler-opts.m4)dnl

builtin(include, build/autoconf/expandlibs.m4)dnl

builtin(include, build/autoconf/arch.m4)dnl



MOZ_PROG_CHECKMSYS()

browser/components/nsBrowserGlue.js

+1 −1
Original line number Diff line number Diff line
@@ -68,7 +68,7 @@ XPCOMUtils.defineLazyModuleGetter(this, "KeywordURLResetPrompter", 
                                  "resource:///modules/KeywordURLResetPrompter.jsm");



XPCOMUtils.defineLazyModuleGetter(this, "webappsUI", 

                                  "resource://gre/modules/webappsUI.jsm");

                                  "resource:///modules/webappsUI.jsm");



const PREF_PLUGINS_NOTIFYUSER = "plugins.update.notifyUser";

const PREF_PLUGINS_UPDATEURL  = "plugins.update.url";

browser/components/sessionstore/src/nsSessionStartup.js

+1 −1
Original line number Diff line number Diff line
@@ -72,7 +72,7 @@ const Cr = Components.results; 
const Cu = Components.utils;

Cu.import("resource://gre/modules/XPCOMUtils.jsm");

Cu.import("resource://gre/modules/Services.jsm");

Cu.import("resource:///modules/TelemetryStopwatch.jsm");

Cu.import("resource://gre/modules/TelemetryStopwatch.jsm");



const STATE_RUNNING_STR = "running";

const MAX_FILE_SIZE = 100 * 1024 * 1024; // 100 megabytes

browser/components/sessionstore/src/nsSessionStore.js

+1 −1
Original line number Diff line number Diff line
@@ -131,7 +131,7 @@ Cu.import("resource://gre/modules/Services.jsm"); 
Cu.import("resource://gre/modules/debug.js");



Cu.import("resource:///modules/TelemetryTimestamps.jsm");

Cu.import("resource:///modules/TelemetryStopwatch.jsm");

Cu.import("resource://gre/modules/TelemetryStopwatch.jsm");



XPCOMUtils.defineLazyGetter(this, "NetUtil", function() {

  Cu.import("resource://gre/modules/NetUtil.jsm");

browser/devtools/debugger/DebuggerUI.jsm

+1 −1
Original line number Diff line number Diff line
@@ -49,7 +49,7 @@ Cu.import("resource://gre/modules/NetUtil.jsm"); 
Cu.import("resource://gre/modules/Services.jsm");

Cu.import("resource://gre/modules/devtools/dbg-server.jsm");

Cu.import("resource://gre/modules/devtools/dbg-client.jsm");

Cu.import("resource:///modules/XPCOMUtils.jsm");

Cu.import("resource://gre/modules/XPCOMUtils.jsm");

Cu.import("resource:///modules/source-editor.jsm");



let EXPORTED_SYMBOLS = ["DebuggerUI"];