зеркало из https://github.com/mozilla/pjs.git
Bug 669028 part.10 embedding should use mozilla::LookAndFeel rather than nsILookAndFeel r=benjamin
This commit is contained in:
Родитель
668a1fe6fb
Коммит
bfb878e374
|
@ -75,7 +75,7 @@
|
|||
#include "gfxContext.h"
|
||||
|
||||
// for painting the background window
|
||||
#include "nsILookAndFeel.h"
|
||||
#include "mozilla/LookAndFeel.h"
|
||||
|
||||
// Printing Includes
|
||||
#ifdef NS_PRINTING
|
||||
|
@ -87,11 +87,11 @@
|
|||
#include "nsISecureBrowserUI.h"
|
||||
#include "nsXULAppAPI.h"
|
||||
|
||||
using namespace mozilla;
|
||||
using namespace mozilla::layers;
|
||||
|
||||
static NS_DEFINE_IID(kWindowCID, NS_WINDOW_CID);
|
||||
static NS_DEFINE_CID(kChildCID, NS_CHILD_CID);
|
||||
static NS_DEFINE_CID(kLookAndFeelCID, NS_LOOKANDFEEL_CID);
|
||||
|
||||
|
||||
//*****************************************************************************
|
||||
|
@ -1165,11 +1165,8 @@ NS_IMETHODIMP nsWebBrowser::Create()
|
|||
NS_ENSURE_SUCCESS(rv, rv);
|
||||
|
||||
// get the system default window background colour
|
||||
{
|
||||
nsCOMPtr<nsILookAndFeel> laf = do_GetService(kLookAndFeelCID);
|
||||
if (laf)
|
||||
laf->GetColor(nsILookAndFeel::eColor_WindowBackground, mBackgroundColor);
|
||||
}
|
||||
LookAndFeel::GetColor(LookAndFeel::eColorID_WindowBackground,
|
||||
&mBackgroundColor);
|
||||
|
||||
// the docshell has been set so we now have our listener registrars.
|
||||
if (mListenerArray) {
|
||||
|
|
Загрузка…
Ссылка в новой задаче