mirror of
https://github.com/mozilla/gecko-dev.git
synced 2024-10-11 12:25:53 +00:00
Bug 275463 embedding/browser/gtk should not use deprecated nsIPref
r=marco sr=roc
This commit is contained in:
parent
61447bc9e5
commit
d671210167
@ -109,7 +109,6 @@ nsIAppShell *EmbedPrivate::sAppShell = nsnull;
|
||||
nsVoidArray *EmbedPrivate::sWindowList = nsnull;
|
||||
char *EmbedPrivate::sProfileDir = nsnull;
|
||||
char *EmbedPrivate::sProfileName = nsnull;
|
||||
nsIPref *EmbedPrivate::sPrefs = nsnull;
|
||||
GtkWidget *EmbedPrivate::sOffscreenWindow = 0;
|
||||
GtkWidget *EmbedPrivate::sOffscreenFixed = 0;
|
||||
nsIDirectoryServiceProvider *EmbedPrivate::sAppFileLocProvider = nsnull;
|
||||
@ -970,14 +969,6 @@ EmbedPrivate::StartupProfile(void)
|
||||
return rv;
|
||||
// Keep a ref so we can shut it down.
|
||||
NS_ADDREF(sProfileDirServiceProvider = locProvider);
|
||||
|
||||
// get prefs
|
||||
nsCOMPtr<nsIPref> pref;
|
||||
pref = do_GetService(NS_PREF_CONTRACTID);
|
||||
if (!pref)
|
||||
return NS_ERROR_FAILURE;
|
||||
sPrefs = pref.get();
|
||||
NS_ADDREF(sPrefs);
|
||||
}
|
||||
return NS_OK;
|
||||
}
|
||||
@ -991,10 +982,6 @@ EmbedPrivate::ShutdownProfile(void)
|
||||
NS_RELEASE(sProfileDirServiceProvider);
|
||||
sProfileDirServiceProvider = 0;
|
||||
}
|
||||
if (sPrefs) {
|
||||
NS_RELEASE(sPrefs);
|
||||
sPrefs = 0;
|
||||
}
|
||||
}
|
||||
|
||||
/* static */
|
||||
|
@ -48,8 +48,6 @@
|
||||
#include <nsIAppShell.h>
|
||||
#include <nsIDOMEventReceiver.h>
|
||||
#include <nsVoidArray.h>
|
||||
// for profiles
|
||||
#include <nsIPref.h>
|
||||
// app component registration
|
||||
#include <nsIGenericFactory.h>
|
||||
#include <nsIComponentRegistrar.h>
|
||||
@ -164,7 +162,6 @@ class EmbedPrivate {
|
||||
static char *sProfileName;
|
||||
// for profiles
|
||||
static nsProfileDirServiceProvider *sProfileDirServiceProvider;
|
||||
static nsIPref *sPrefs;
|
||||
|
||||
static nsIDirectoryServiceProvider * sAppFileLocProvider;
|
||||
|
||||
|
@ -59,7 +59,6 @@ REQUIRES = xpcom \
|
||||
webbrwsr \
|
||||
shistory \
|
||||
embed_base \
|
||||
pref \
|
||||
windowwatcher \
|
||||
profdirserviceprovider \
|
||||
$(NULL)
|
||||
|
Loading…
Reference in New Issue
Block a user