From 9494e70c611fd035a70809921bd0fa58fb15369b Mon Sep 17 00:00:00 2001 From: Masayuki Nakano Date: Fri, 9 Sep 2011 11:27:12 +0900 Subject: [PATCH] Bug 669028 part.5 accessible should use mozilla::LookAndFeel rather than nsILookAndFeel r=surkov.alexander --- accessible/src/xul/nsXULMenuAccessible.cpp | 11 +++-------- 1 file changed, 3 insertions(+), 8 deletions(-) diff --git a/accessible/src/xul/nsXULMenuAccessible.cpp b/accessible/src/xul/nsXULMenuAccessible.cpp index a79bf50c5827..2e48f5e1b876 100644 --- a/accessible/src/xul/nsXULMenuAccessible.cpp +++ b/accessible/src/xul/nsXULMenuAccessible.cpp @@ -54,17 +54,14 @@ #include "nsIPresShell.h" #include "nsIContent.h" #include "nsGUIEvent.h" -#include "nsILookAndFeel.h" -#include "nsWidgetsCID.h" #include "mozilla/Preferences.h" +#include "mozilla/LookAndFeel.h" #include "mozilla/dom/Element.h" using namespace mozilla; using namespace mozilla::a11y; -static NS_DEFINE_CID(kLookAndFeelCID, NS_LOOKANDFEEL_CID); - //////////////////////////////////////////////////////////////////////////////// // nsXULSelectableAccessible //////////////////////////////////////////////////////////////////////////////// @@ -360,10 +357,8 @@ nsXULMenuitemAccessible::NativeState() // and whose metric setting does allow disabled items to be focused. if (state & states::UNAVAILABLE) { // Honour the LookAndFeel metric. - nsCOMPtr lookNFeel(do_GetService(kLookAndFeelCID)); - PRInt32 skipDisabledMenuItems = 0; - lookNFeel->GetMetric(nsILookAndFeel::eMetric_SkipNavigatingDisabledMenuItem, - skipDisabledMenuItems); + PRInt32 skipDisabledMenuItems = + LookAndFeel::GetInt(LookAndFeel::eIntID_SkipNavigatingDisabledMenuItem); // We don't want the focusable and selectable states for combobox items, // so exclude them here as well. if (skipDisabledMenuItems || isComboboxOption) {