corysanin/tubestation
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Bug 702877 - Replace NS_OVERRIDE with MOZ_OVERRIDE. r=ehsan

Browse Source
This commit is contained in:
Joshua Cranmer
2012-07-06 13:15:45 -05:00
parent b5ce02aa3f
commit 68b27cf092
78 changed files with 644 additions and 1059 deletions
Download Patch File Download Diff File Expand all files Collapse all files

28
dom/plugins/ipc/PluginModuleChild.h
View File

@@ -78,15 +78,13 @@ class PluginModuleChild : public PPluginModuleChild
{
typedef mozilla::dom::PCrashReporterChild PCrashReporterChild;
protected:
NS_OVERRIDE
virtual mozilla::ipc::RPCChannel::RacyRPCPolicy
MediateRPCRace(const Message& parent, const Message& child)
MediateRPCRace(const Message& parent, const Message& child) MOZ_OVERRIDE
{
return MediateRace(parent, child);
}
NS_OVERRIDE
virtual bool ShouldContinueFromReplyTimeout();
virtual bool ShouldContinueFromReplyTimeout() MOZ_OVERRIDE;
// Implement the PPluginModuleChild interface
virtual bool AnswerNP_GetEntryPoints(NPError* rv);
@@ -163,8 +161,8 @@ protected:
MOZ_NORETURN void QuickExit();
NS_OVERRIDE virtual bool
RecvProcessNativeEventsInRPCCall();
virtual bool
RecvProcessNativeEventsInRPCCall() MOZ_OVERRIDE;
public:
PluginModuleChild();
@@ -310,16 +308,12 @@ private:
static gboolean DetectNestedEventLoop(gpointer data);
static gboolean ProcessBrowserEvents(gpointer data);
NS_OVERRIDE
virtual void EnteredCxxStack();
NS_OVERRIDE
virtual void ExitedCxxStack();
virtual void EnteredCxxStack() MOZ_OVERRIDE;
virtual void ExitedCxxStack() MOZ_OVERRIDE;
#elif defined(MOZ_WIDGET_QT)
NS_OVERRIDE
virtual void EnteredCxxStack();
NS_OVERRIDE
virtual void ExitedCxxStack();
virtual void EnteredCxxStack() MOZ_OVERRIDE;
virtual void ExitedCxxStack() MOZ_OVERRIDE;
#endif
PRLibrary* mLibrary;
@@ -429,10 +423,8 @@ private:
static PLDHashOperator CollectForInstance(NPObjectData* d, void* userArg);
#if defined(OS_WIN)
NS_OVERRIDE
virtual void EnteredCall();
NS_OVERRIDE
virtual void ExitedCall();
virtual void EnteredCall() MOZ_OVERRIDE;
virtual void ExitedCall() MOZ_OVERRIDE;
// Entered/ExitedCall notifications keep track of whether the plugin has
// entered a nested event loop within this RPC call.