Index: content/ppapi_plugin/ppapi_thread.h |
diff --git a/content/ppapi_plugin/ppapi_thread.h b/content/ppapi_plugin/ppapi_thread.h |
index 58fceeb6f5d5866594cfe28adb1733badb4d3763..3d80e490c9fb348ca0b43acefe2e0ca3b32444a8 100644 |
--- a/content/ppapi_plugin/ppapi_thread.h |
+++ b/content/ppapi_plugin/ppapi_thread.h |
@@ -45,8 +45,8 @@ class PpapiThread : public ChildThread, |
public ppapi::proxy::PluginProxyDelegate { |
public: |
PpapiThread(const base::CommandLine& command_line, bool is_broker); |
- virtual ~PpapiThread(); |
- virtual void Shutdown() override; |
+ ~PpapiThread() override; |
+ void Shutdown() override; |
private: |
// Make sure the enum list in tools/histogram/histograms.xml is updated with |
@@ -62,34 +62,32 @@ class PpapiThread : public ChildThread, |
}; |
// ChildThread overrides. |
- virtual bool Send(IPC::Message* msg) override; |
- virtual bool OnControlMessageReceived(const IPC::Message& msg) override; |
- virtual void OnChannelConnected(int32 peer_pid) override; |
+ bool Send(IPC::Message* msg) override; |
+ bool OnControlMessageReceived(const IPC::Message& msg) override; |
+ void OnChannelConnected(int32 peer_pid) override; |
// PluginDispatcher::PluginDelegate implementation. |
- virtual std::set<PP_Instance>* GetGloballySeenInstanceIDSet() override; |
- virtual base::MessageLoopProxy* GetIPCMessageLoop() override; |
- virtual base::WaitableEvent* GetShutdownEvent() override; |
- virtual IPC::PlatformFileForTransit ShareHandleWithRemote( |
+ std::set<PP_Instance>* GetGloballySeenInstanceIDSet() override; |
+ base::MessageLoopProxy* GetIPCMessageLoop() override; |
+ base::WaitableEvent* GetShutdownEvent() override; |
+ IPC::PlatformFileForTransit ShareHandleWithRemote( |
base::PlatformFile handle, |
base::ProcessId peer_pid, |
bool should_close_source) override; |
- virtual uint32 Register( |
- ppapi::proxy::PluginDispatcher* plugin_dispatcher) override; |
- virtual void Unregister(uint32 plugin_dispatcher_id) override; |
+ uint32 Register(ppapi::proxy::PluginDispatcher* plugin_dispatcher) override; |
+ void Unregister(uint32 plugin_dispatcher_id) override; |
// PluginProxyDelegate. |
// SendToBrowser() is intended to be safe to use on another thread so |
// long as the main PpapiThread outlives it. |
- virtual IPC::Sender* GetBrowserSender() override; |
- virtual std::string GetUILanguage() override; |
- virtual void PreCacheFont(const void* logfontw) override; |
- virtual void SetActiveURL(const std::string& url) override; |
- virtual PP_Resource CreateBrowserFont( |
- ppapi::proxy::Connection connection, |
- PP_Instance instance, |
- const PP_BrowserFont_Trusted_Description& desc, |
- const ppapi::Preferences& prefs) override; |
+ IPC::Sender* GetBrowserSender() override; |
+ std::string GetUILanguage() override; |
+ void PreCacheFont(const void* logfontw) override; |
+ void SetActiveURL(const std::string& url) override; |
+ PP_Resource CreateBrowserFont(ppapi::proxy::Connection connection, |
+ PP_Instance instance, |
+ const PP_BrowserFont_Trusted_Description& desc, |
+ const ppapi::Preferences& prefs) override; |
// Message handlers. |
void OnLoadPlugin(const base::FilePath& path, |