Magic-Mirror/gecko-dev
1
0
Fork 0
mirror of https://github.com/mozilla/gecko-dev.git synced 2025-01-26 23:23:33 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Bug 486137: less xpconnect stuff in browser[-ui].js r=mfinkle

Browse Source
This commit is contained in:
Taras Glek 2009-03-31 11:45:24 -07:00
parent d25962138c
commit 6ae483373c
2 changed files with 16 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
mobile/chrome/content/browser-ui.js
View File

@ -197,10 +197,7 @@ var BrowserUI = {
document.getElementById("panel-items").selectedPanel = document.getElementById(id);
},
sizeControls : function() {
let windowW = window.innerWidth;
let windowH = window.innerHeight;
sizeControls : function(windowW, windowH) {
let toolbar = document.getElementById("toolbar-main");
if (!this._toolbarH)
this._toolbarH = toolbar.boxObject.height;

31
mobile/chrome/content/browser.js
View File

@ -26,6 +26,7 @@
* Aleks Totic <a@totic.org>
* Johnathan Nightingale <johnath@mozilla.com>
* Stuart Parmenter <stuart@mozilla.com>
* Taras Glek <tglek@mozilla.com>
*
* Alternatively, the contents of this file may be used under the terms of
* either the GNU General Public License Version 2 or later (the "GPL"), or
@ -108,14 +109,14 @@ var Browser = {
return;
let w = window.innerWidth;
let h = window.innerHeight;
let maximize = (document.documentElement.getAttribute("sizemode") == "maximized");
if (maximize && window.innerWidth > screen.width)
if (maximize && w > screen.width)
return;
let h = window.innerHeight;
// tell the UI to resize the browser controls before calling
// updateSize
BrowserUI.sizeControls();
BrowserUI.sizeControls(w, h);
// resize our container...
let containerStyle = browserContainer.style;
@ -626,7 +627,7 @@ IdentityHandler.prototype = {
*/
getIdentityData: function() {
var result = {};
var status = this._lastStatus.QueryInterface(Components.interfaces.nsISSLStatus);
var status = this._lastStatus.QueryInterface(Ci.nsISSLStatus);
var cert = status.serverCert;
// Human readable name of Subject
@ -664,14 +665,14 @@ IdentityHandler.prototype = {
*/
checkIdentity: function(state, location) {
var currentStatus = getBrowser().securityUI
.QueryInterface(Components.interfaces.nsISSLStatusProvider)
.QueryInterface(Ci.nsISSLStatusProvider)
.SSLStatus;
this._lastStatus = currentStatus;
this._lastLocation = location;
if (state & Components.interfaces.nsIWebProgressListener.STATE_IDENTITY_EV_TOPLEVEL)
if (state & Ci.nsIWebProgressListener.STATE_IDENTITY_EV_TOPLEVEL)
this.setMode(this.IDENTITY_MODE_IDENTIFIED);
else if (state & Components.interfaces.nsIWebProgressListener.STATE_SECURE_HIGH)
else if (state & Ci.nsIWebProgressListener.STATE_SECURE_HIGH)
this.setMode(this.IDENTITY_MODE_DOMAIN_VERIFIED);
else
this.setMode(this.IDENTITY_MODE_UNKNOWN);
@ -731,8 +732,7 @@ IdentityHandler.prototype = {
// Cache the override service the first time we need to check it
if (!this._overrideService)
this._overrideService = Components.classes["@mozilla.org/security/certoverride;1"]
.getService(Components.interfaces.nsICertOverrideService);
this._overrideService = Cc["@mozilla.org/security/certoverride;1"].getService(Ci.nsICertOverrideService);
// Verifier is either the CA Org, for a normal cert, or a special string
// for certs that are trusted because of a security exception.
@ -869,7 +869,7 @@ function getIdentityHandler() {
* Handler for blocked popups, triggered by DOMUpdatePageReport events in browser.xml
*/
const gPopupBlockerObserver = {
_kIPM: Components.interfaces.nsIPermissionManager,
_kIPM: Ci.nsIPermissionManager,
onUpdatePageReport: function (aEvent)
{
@ -930,8 +930,7 @@ const gPopupBlockerObserver = {
toggleAllowPopupsForSite: function (aEvent)
{
var currentURI = Browser.selectedBrowser.webNavigation.currentURI;
var pm = Components.classes["@mozilla.org/permissionmanager;1"]
.getService(this._kIPM);
var pm = Cc["@mozilla.org/permissionmanager;1"].getService(this._kIPM);
pm.add(currentURI, "popup", this._kIPM.ALLOW_ACTION);
Browser.getNotificationBox().removeCurrentNotification();
@ -952,7 +951,7 @@ const gXPInstallObserver = {
var browserBundle = document.getElementById("bundle_browser");
switch (aTopic) {
case "xpinstall-install-blocked":
var installInfo = aSubject.QueryInterface(Components.interfaces.nsIXPIInstallInfo);
var installInfo = aSubject.QueryInterface(Ci.nsIXPIInstallInfo);
var host = installInfo.originatingURI.host;
var brandShortName = brandBundle.getString("brandShortName");
var notificationName, messageString, buttons;
@ -1182,9 +1181,9 @@ ProgressController.prototype = {
},
QueryInterface: function(aIID) {
if (aIID.equals(Components.interfaces.nsIWebProgressListener) ||
aIID.equals(Components.interfaces.nsISupportsWeakReference) ||
aIID.equals(Components.interfaces.nsISupports))
if (aIID.equals(Ci.nsIWebProgressListener) ||
aIID.equals(Ci.nsISupportsWeakReference) ||
aIID.equals(Ci.nsISupports))
return this;
throw Components.results.NS_ERROR_NO_INTERFACE;