Skip to content

Bug 1238537 - Changed all applicable instances of getService to the l… #16

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
Orangehop wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Bug 1238537 - Changed all applicable instances of getService to the l… #16

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
29 changes: 8 additions & 21 deletions browser/components/nsBrowserContentHandler.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -34,13 +34,9 @@ const nsIDOMWindow = Components.interfaces.nsIDOMWindow;
const nsIFileURL = Components.interfaces.nsIFileURL;
const nsIInterfaceRequestor = Components.interfaces.nsIInterfaceRequestor;
const nsINetUtil = Components.interfaces.nsINetUtil;
const nsIPrefBranch = Components.interfaces.nsIPrefBranch;
const nsIPrefLocalizedString = Components.interfaces.nsIPrefLocalizedString;
const nsISupportsString = Components.interfaces.nsISupportsString;
const nsIURIFixup = Components.interfaces.nsIURIFixup;
const nsIWebNavigation = Components.interfaces.nsIWebNavigation;
const nsIWindowMediator = Components.interfaces.nsIWindowMediator;
const nsIWindowWatcher = Components.interfaces.nsIWindowWatcher;
const nsIWebNavigationInfo = Components.interfaces.nsIWebNavigationInfo;
const nsICommandLineValidator = Components.interfaces.nsICommandLineValidator;

Expand All @@ -59,8 +55,7 @@ function shouldLoadURI(aURI) {

function resolveURIInternal(aCmdLine, aArgument) {
var uri = aCmdLine.resolveURI(aArgument);
var urifixup = Components.classes["@mozilla.org/docshell/urifixup;1"]
.getService(nsIURIFixup);
var urifixup = Services.uriFixup;

if (!(uri instanceof nsIFileURL)) {
return urifixup.createFixupURI(aArgument,
Expand Down Expand Up @@ -181,8 +176,7 @@ function getPostUpdateOverridePage(defaultOverridePage) {
const NO_EXTERNAL_URIS = 1;

function openWindow(parent, url, target, features, args, noExternalArgs) {
var wwatch = Components.classes["@mozilla.org/embedcomp/window-watcher;1"]
.getService(nsIWindowWatcher);
var wwatch = Services.ww;

if (noExternalArgs == NO_EXTERNAL_URIS) {
// Just pass in the defaultArgs directly
Expand Down Expand Up @@ -243,8 +237,7 @@ function openPreferences() {

sa.AppendElement(wuri);

var wwatch = Components.classes["@mozilla.org/embedcomp/window-watcher;1"]
.getService(nsIWindowWatcher);
var wwatch = Services.ww;

wwatch.openWindow(null, gBrowserContentHandler.chromeURL,
"_blank",
Expand All @@ -253,9 +246,7 @@ function openPreferences() {
}

function getMostRecentWindow(aType) {
var wm = Components.classes["@mozilla.org/appshell/window-mediator;1"]
.getService(nsIWindowMediator);
return wm.getMostRecentWindow(aType);
return Services.wm.getMostRecentWindow(aType);
}

function logSystemBasedSearch(engine) {
Expand Down Expand Up @@ -286,8 +277,7 @@ function doSearch(searchTerm, cmdLine) {
// XXXbsmedberg: use handURIToExistingBrowser to obey tabbed-browsing
// preferences, but need nsIBrowserDOMWindow extensions

var wwatch = Components.classes["@mozilla.org/embedcomp/window-watcher;1"]
.getService(nsIWindowWatcher);
var wwatch = Services.ww;

return wwatch.openWindow(null, gBrowserContentHandler.chromeURL,
"_blank",
Expand Down Expand Up @@ -318,8 +308,7 @@ nsBrowserContentHandler.prototype = {
return this.mChromeURL;
}

var prefb = Components.classes["@mozilla.org/preferences-service;1"]
.getService(nsIPrefBranch);
var prefb = Services.prefs;
this.mChromeURL = prefb.getCharPref("browser.chromeURL");

return this.mChromeURL;
Expand Down Expand Up @@ -494,8 +483,7 @@ nsBrowserContentHandler.prototype = {
/* nsIBrowserHandler */

get defaultArgs() {
var prefb = Components.classes["@mozilla.org/preferences-service;1"]
.getService(nsIPrefBranch);
var prefb = Services.prefs;

if (!gFirstWindow) {
gFirstWindow = true;
Expand Down Expand Up @@ -747,8 +735,7 @@ nsDefaultCommandLineHandler.prototype = {
if (!this._haveProfile) {
try {
// This will throw when a profile has not been selected.
var fl = Components.classes["@mozilla.org/file/directory_service;1"]
.getService(Components.interfaces.nsIProperties);
var fl = Services.dirsvc;
var dir = fl.get("ProfD", Components.interfaces.nsILocalFile);
this._haveProfile = true;
}
Expand Down