Bug 1702741 - Backed out changeset e73c8437e0ec for test failures. rs=backout DONTBUILD
This commit is contained in:
Родитель
4c14aecf5c
Коммит
b70e3474c9
|
@ -13,7 +13,7 @@ addEventListener("sizemodechange", () => {
|
|||
var bw = docShell.treeOwner.QueryInterface(Ci.nsIBaseWindow);
|
||||
Cc["@mozilla.org/messenger/osintegration;1"]
|
||||
.getService(Ci.nsIMessengerWindowsIntegration)
|
||||
.hideWindow(bw);
|
||||
.HideWindow(bw);
|
||||
});
|
||||
}
|
||||
});
|
||||
|
|
|
@ -320,10 +320,6 @@ var MailUtils = {
|
|||
let mail3PaneWindow = Services.wm.getMostRecentWindow("mail:3pane");
|
||||
if (mail3PaneWindow) {
|
||||
mail3PaneWindow.MsgDisplayMessageInFolderTab(aMsgHdr);
|
||||
Cc["@mozilla.org/messenger/osintegration;1"]
|
||||
?.getService(Ci.nsIMessengerWindowsIntegration)
|
||||
?.showWindow(mail3PaneWindow);
|
||||
mail3PaneWindow.focus();
|
||||
} else {
|
||||
let args = { msgHdr: aMsgHdr };
|
||||
args.wrappedJSObject = args;
|
||||
|
|
|
@ -3,14 +3,10 @@
|
|||
* License, v. 2.0. If a copy of the MPL was not distributed with this
|
||||
* file, You can obtain one at http://mozilla.org/MPL/2.0/. */
|
||||
|
||||
interface mozIDOMWindowProxy;
|
||||
|
||||
#include "nsIBaseWindow.idl"
|
||||
#include "nsIMessengerOSIntegration.idl"
|
||||
|
||||
[scriptable, uuid(e14eb9fe-e05e-4b78-bd31-5b7e1497f91b)]
|
||||
interface nsIMessengerWindowsIntegration : nsIMessengerOSIntegration {
|
||||
void hideWindow(in nsIBaseWindow aWindow);
|
||||
|
||||
void showWindow(in mozIDOMWindowProxy aWindow);
|
||||
void HideWindow(in nsIBaseWindow aWindow);
|
||||
};
|
||||
|
|
|
@ -185,12 +185,6 @@ nsresult nsMessengerWinIntegration::HideWindow(nsIBaseWindow* aWindow) {
|
|||
return NS_OK;
|
||||
}
|
||||
|
||||
NS_IMETHODIMP
|
||||
nsMessengerWinIntegration::ShowWindow(mozIDOMWindowProxy* aWindow) {
|
||||
activateWindow(aWindow);
|
||||
return NS_OK;
|
||||
}
|
||||
|
||||
NS_IMETHODIMP
|
||||
nsMessengerWinIntegration::UpdateUnreadCount(uint32_t unreadCount,
|
||||
const nsAString& unreadTooltip) {
|
||||
|
|
Загрузка…
Ссылка в новой задаче