зеркало из https://github.com/mozilla/gecko-dev.git
Bug 1034317: Inherit from interfaces when using the NS_DECL_NSIFOO macros in toolkit. r=mak
This commit is contained in:
Родитель
ee14e9c264
Коммит
da96f21c63
|
@ -622,7 +622,8 @@ NS_DEFINE_STATIC_IID_ACCESSOR(nsNavHistoryContainerResultNode,
|
|||
// bookmark notifications.
|
||||
|
||||
class nsNavHistoryQueryResultNode : public nsNavHistoryContainerResultNode,
|
||||
public nsINavHistoryQueryResultNode
|
||||
public nsINavHistoryQueryResultNode,
|
||||
public nsINavBookmarkObserver
|
||||
{
|
||||
public:
|
||||
nsNavHistoryQueryResultNode(const nsACString& aTitle,
|
||||
|
@ -705,6 +706,7 @@ protected:
|
|||
|
||||
class nsNavHistoryFolderResultNode : public nsNavHistoryContainerResultNode,
|
||||
public nsINavHistoryQueryResultNode,
|
||||
public nsINavBookmarkObserver,
|
||||
public mozilla::places::AsyncStatementCallback
|
||||
{
|
||||
public:
|
||||
|
@ -734,9 +736,8 @@ public:
|
|||
virtual nsresult OpenContainerAsync();
|
||||
NS_DECL_ASYNCSTATEMENTCALLBACK
|
||||
|
||||
// This object implements a bookmark observer interface without deriving from
|
||||
// the bookmark observers. This is called from the result's actual observer
|
||||
// and it knows all observers are FolderResultNodes
|
||||
// This object implements a bookmark observer interface. This is called from the
|
||||
// result's actual observer and it knows all observers are FolderResultNodes
|
||||
NS_DECL_NSINAVBOOKMARKOBSERVER
|
||||
|
||||
virtual void OnRemoving();
|
||||
|
|
Загрузка…
Ссылка в новой задаче