Bug 258106: nsDocShell should use nsIPrefService APIs instead of nsIPref.
Patch by Mikael Parknert (mikael@parknert.se), r=bzbarsky, sr=roc. git-svn-id: svn://10.0.0.236/trunk@161827 18797224-902f-48f8-a5cc-f745e15eee43
This commit is contained in:
parent
f9cc5b8c67
commit
a04d276004
@ -82,6 +82,7 @@
|
||||
#include "nsXPCOMCID.h"
|
||||
#include "nsISeekableStream.h"
|
||||
#include "nsAutoPtr.h"
|
||||
#include "nsIPrefService.h"
|
||||
|
||||
// we want to explore making the document own the load group
|
||||
// so we can associate the document URI with the load group.
|
||||
@ -3092,7 +3093,7 @@ NS_IMETHODIMP
|
||||
nsDocShell::Create()
|
||||
{
|
||||
nsresult rv = NS_ERROR_FAILURE;
|
||||
mPrefs = do_GetService(NS_PREF_CONTRACTID, &rv);
|
||||
mPrefs = do_GetService(NS_PREFSERVICE_CONTRACTID, &rv);
|
||||
NS_ENSURE_SUCCESS(rv, rv);
|
||||
|
||||
PRBool tmpbool;
|
||||
|
||||
@ -46,7 +46,7 @@
|
||||
#include "nsIViewManager.h"
|
||||
#include "nsIScrollableView.h"
|
||||
#include "nsIContentViewer.h"
|
||||
#include "nsIPref.h"
|
||||
#include "nsIPrefBranch.h"
|
||||
#include "nsVoidArray.h"
|
||||
#include "nsIScriptContext.h"
|
||||
#include "nsITimer.h"
|
||||
@ -402,7 +402,7 @@ protected:
|
||||
nsCOMPtr<nsIDeviceContext> mDeviceContext;
|
||||
nsCOMPtr<nsIDocumentLoader>mDocLoader;
|
||||
nsCOMPtr<nsIWidget> mParentWidget;
|
||||
nsCOMPtr<nsIPref> mPrefs;
|
||||
nsCOMPtr<nsIPrefBranch> mPrefs;
|
||||
nsCOMPtr<nsIURI> mCurrentURI;
|
||||
nsCOMPtr<nsIURI> mReferrerURI;
|
||||
nsCOMPtr<nsIScriptGlobalObject> mScriptGlobal;
|
||||
|
||||
Loading…
x
Reference in New Issue
Block a user