Index: ppapi/proxy/plugin_globals.h |
diff --git a/ppapi/proxy/plugin_globals.h b/ppapi/proxy/plugin_globals.h |
index fe24ed66d6f585ea297fc6bb45afba868ecbf33a..28cfe486dad4d6ebd05d9c0bc0b5deb0dbab94d0 100644 |
--- a/ppapi/proxy/plugin_globals.h |
+++ b/ppapi/proxy/plugin_globals.h |
@@ -44,7 +44,7 @@ class PPAPI_PROXY_EXPORT PluginGlobals : public PpapiGlobals { |
explicit PluginGlobals(const scoped_refptr<base::TaskRunner>& task_runner); |
PluginGlobals(PpapiGlobals::PerThreadForTest, |
const scoped_refptr<base::TaskRunner>& task_runner); |
- virtual ~PluginGlobals(); |
+ ~PluginGlobals() override; |
// Getter for the global singleton. Generally, you should use |
// PpapiGlobals::Get() when possible. Use this only when you need some |
@@ -57,28 +57,26 @@ class PPAPI_PROXY_EXPORT PluginGlobals : public PpapiGlobals { |
} |
// PpapiGlobals implementation. |
- virtual ResourceTracker* GetResourceTracker() override; |
- virtual VarTracker* GetVarTracker() override; |
- virtual CallbackTracker* GetCallbackTrackerForInstance( |
+ ResourceTracker* GetResourceTracker() override; |
+ VarTracker* GetVarTracker() override; |
+ CallbackTracker* GetCallbackTrackerForInstance(PP_Instance instance) override; |
+ thunk::PPB_Instance_API* GetInstanceAPI(PP_Instance instance) override; |
+ thunk::ResourceCreationAPI* GetResourceCreationAPI( |
PP_Instance instance) override; |
- virtual thunk::PPB_Instance_API* GetInstanceAPI( |
- PP_Instance instance) override; |
- virtual thunk::ResourceCreationAPI* GetResourceCreationAPI( |
- PP_Instance instance) override; |
- virtual PP_Module GetModuleForInstance(PP_Instance instance) override; |
- virtual std::string GetCmdLine() override; |
- virtual void PreCacheFontForFlash(const void* logfontw) override; |
- virtual void LogWithSource(PP_Instance instance, |
- PP_LogLevel level, |
- const std::string& source, |
- const std::string& value) override; |
- virtual void BroadcastLogWithSource(PP_Module module, |
- PP_LogLevel level, |
- const std::string& source, |
- const std::string& value) override; |
- virtual MessageLoopShared* GetCurrentMessageLoop() override; |
+ PP_Module GetModuleForInstance(PP_Instance instance) override; |
+ std::string GetCmdLine() override; |
+ void PreCacheFontForFlash(const void* logfontw) override; |
+ void LogWithSource(PP_Instance instance, |
+ PP_LogLevel level, |
+ const std::string& source, |
+ const std::string& value) override; |
+ void BroadcastLogWithSource(PP_Module module, |
+ PP_LogLevel level, |
+ const std::string& source, |
+ const std::string& value) override; |
+ MessageLoopShared* GetCurrentMessageLoop() override; |
base::TaskRunner* GetFileTaskRunner() override; |
- virtual void MarkPluginIsActive() override; |
+ void MarkPluginIsActive() override; |
// Returns the channel for sending to the browser. |
IPC::Sender* GetBrowserSender(); |
@@ -159,7 +157,7 @@ class PPAPI_PROXY_EXPORT PluginGlobals : public PpapiGlobals { |
class BrowserSender; |
// PpapiGlobals overrides. |
- virtual bool IsPluginGlobals() const override; |
+ bool IsPluginGlobals() const override; |
// Locks the proxy lock and releases the throttle on keepalive IPC messages. |
void OnReleaseKeepaliveThrottle(); |