wine/gecko
0
0
Fork 0
mirror of https://gitlab.winehq.org/wine/wine-gecko.git synced 2024-09-13 09:24:08 -07:00
Code Issues Packages Projects Releases Wiki Activity

Backed out changeset 364409371144 because of the orange

Browse Source
This commit is contained in:
Ehsan Akhgari 2010-11-18 18:35:04 -05:00
parent 56f296ce48
commit fa11f878bf
3 changed files with 22 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
browser/base/content/browser.js
View File

@ -1252,9 +1252,6 @@ function BrowserStartup() {
BookmarksMenuButton.init();
// initialize the private browsing UI
gPrivateBrowsingUI.init();
setTimeout(delayedStartup, 0, isLoadingBlank, mustLoadSidebar);
}
@ -1541,6 +1538,9 @@ function delayedStartup(isLoadingBlank, mustLoadSidebar) {
placesContext.addEventListener("popuphiding", updateEditUIVisibility, false);
#endif
// initialize the private browsing UI
gPrivateBrowsingUI.init();
gBrowser.mPanelContainer.addEventListener("InstallBrowserTheme", LightWeightThemeWebInstaller, false, true);
gBrowser.mPanelContainer.addEventListener("PreviewBrowserTheme", LightWeightThemeWebInstaller, false, true);
gBrowser.mPanelContainer.addEventListener("ResetBrowserThemePreview", LightWeightThemeWebInstaller, false, true);

23
browser/components/privatebrowsing/test/browser/browser_privatebrowsing_newwindow_stopcmd.js
View File

@ -47,16 +47,17 @@ function test() {
pb.privateBrowsingEnabled = true;
let win = OpenBrowserWindow();
win.addEventListener("load", function() {
win.removeEventListener("load", arguments.callee, false);
executeSoon(function() {
let cmd = win.document.getElementById("Tools:PrivateBrowsing");
ok(!cmd.hasAttribute("disabled"),
"The Private Browsing command in a new window should be enabled");
Services.obs.addObserver(function(subject, topic, data) {
Services.obs.removeObserver(arguments.callee, "browser-delayed-startup-finished");
var notifiedWin = subject.QueryInterface(Ci.nsIDOMWindow);
is(win, notifiedWin, "sanity check");
win.close();
pb.privateBrowsingEnabled = false;
finish();
});
}, false);
let cmd = win.document.getElementById("Tools:PrivateBrowsing");
ok(!cmd.hasAttribute("disabled"),
"The Private Browsing command in a new window should be enabled");
win.close();
pb.privateBrowsingEnabled = false;
finish();
}, "browser-delayed-startup-finished", false);
}

9
browser/components/privatebrowsing/test/browser/browser_privatebrowsing_windowtitle.js
View File

@ -93,14 +93,19 @@ function test() {
win.addEventListener("load", function() {
win.removeEventListener("load", arguments.callee, false);
executeSoon(function() {
// ensure that the test is run after delayedStartup
let _delayedStartup = win.delayedStartup;
win.delayedStartup = function() {
_delayedStartup.apply(win, arguments);
win.delayedStartup = _delayedStartup;
is(win.document.title, expected_title, "The window title for " + url +
" detached tab is correct (" + (insidePB ? "inside" : "outside") +
" private browsing mode)");
win.close();
setTimeout(funcNext, 0);
});
};
}, false);
});
}, false);