Magic-Mirror/gecko-dev
1
0
Fork 0
mirror of https://github.com/mozilla/gecko-dev.git synced 2024-12-02 01:48:05 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

merge m-c to fx-team

Browse Source
This commit is contained in:
Tim Taubert 2013-04-03 12:30:29 +02:00
commit 350c37fdaf
4 changed files with 12 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
browser/devtools/framework/ToolDefinitions.jsm
View File

@ -147,7 +147,7 @@ let styleEditorDefinition = {
let profilerDefinition = {
id: "jsprofiler",
accesskey: l10n("profiler.accesskey", profilerStrings),
key: l10n("profiler.commandkey", profilerStrings),
key: l10n("profiler2.commandkey", profilerStrings),
ordinal: 4,
modifiers: "shift",
killswitch: "devtools.profiler.enabled",

4
browser/locales/en-US/chrome/browser/devtools/profiler.properties
View File

@ -15,9 +15,9 @@
# displayed inside the developer tools window and in the Developer Tools Menu.
profiler.label=Profiler
# LOCALIZATION NOTE (profiler.commandkey, profiler.accesskey)
# LOCALIZATION NOTE (profiler2.commandkey, profiler.accesskey)
# Used for the menuitem in the tool menu
profiler.commandkey=VK_F5
profiler2.commandkey=VK_F5
profiler.accesskey=P
# LOCALIZATION NOTE (profiler.tooltip):

8
toolkit/mozapps/extensions/XPIProvider.jsm
View File

@ -1672,9 +1672,15 @@ var XPIProvider = {
for (let id in this.bootstrappedAddons) {
let file = Cc["@mozilla.org/file/local;1"].createInstance(Ci.nsIFile);
file.persistentDescriptor = this.bootstrappedAddons[id].descriptor;
let reason = BOOTSTRAP_REASONS.APP_STARTUP;
// Eventually set INSTALLED reason when a bootstrap addon
// is dropped in profile folder and automatically installed
if (AddonManager.getStartupChanges(AddonManager.STARTUP_CHANGE_INSTALLED)
.indexOf(id) !== -1)
reason = BOOTSTRAP_REASONS.ADDON_INSTALL;
this.callBootstrapMethod(id, this.bootstrappedAddons[id].version,
this.bootstrappedAddons[id].type, file,
"startup", BOOTSTRAP_REASONS.APP_STARTUP);
"startup", reason);
}
AddonManagerPrivate.recordTimestamp("XPI_bootstrap_addons_end");

4
toolkit/mozapps/extensions/test/xpcshell/test_bootstrap.js
View File

@ -487,7 +487,7 @@ function run_test_8() {
do_check_true(b1.isActive);
do_check_eq(getInstalledVersion(), 1);
do_check_eq(getActiveVersion(), 1);
do_check_eq(getStartupReason(), APP_STARTUP);
do_check_eq(getStartupReason(), ADDON_INSTALL);
do_check_eq(getStartupOldVersion(), 0);
do_check_in_crash_annotation("bootstrap1@tests.mozilla.org", "1.0");
@ -666,7 +666,7 @@ function run_test_12() {
do_check_true(b1.isActive);
do_check_eq(getInstalledVersion(), 1);
do_check_eq(getActiveVersion(), 1);
do_check_eq(getStartupReason(), APP_STARTUP);
do_check_eq(getStartupReason(), ADDON_INSTALL);
do_check_eq(getStartupOldVersion(), 0);
do_check_in_crash_annotation("bootstrap1@tests.mozilla.org", "1.0");