Bug 669028 part.10 embedding should use mozilla::LookAndFeel rather than nsILookAndFeel r=benjamin

This commit is contained in:
Masayuki Nakano 2011-09-09 11:27:12 +09:00
parent 27777a6f2a
commit 5b9e04dcf2

View File

@ -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);
//*****************************************************************************
@ -1164,12 +1164,9 @@ NS_IMETHODIMP nsWebBrowser::Create()
rv = SetDocShell(docShell);
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);
}
// get the system default window background colour
LookAndFeel::GetColor(LookAndFeel::eColorID_WindowBackground,
&mBackgroundColor);
// the docshell has been set so we now have our listener registrars.
if (mListenerArray) {