| Index: content/renderer/pepper/host_globals.h
|
| diff --git a/content/renderer/pepper/host_globals.h b/content/renderer/pepper/host_globals.h
|
| index 5320234a4bf12fe9e8e33e241c073f5538543c71..9ce071cc0b1d78bdb895501c881d588ea2bc7d1d 100644
|
| --- a/content/renderer/pepper/host_globals.h
|
| +++ b/content/renderer/pepper/host_globals.h
|
| @@ -20,7 +20,7 @@ class PluginModule;
|
| class HostGlobals : public ppapi::PpapiGlobals {
|
| public:
|
| HostGlobals();
|
| - virtual ~HostGlobals();
|
| + ~HostGlobals() override;
|
|
|
| // Getter for the global singleton. Generally, you should use
|
| // PpapiGlobals::Get() when possible. Use this only when you need some
|
| @@ -31,27 +31,26 @@ class HostGlobals : public ppapi::PpapiGlobals {
|
| }
|
|
|
| // PpapiGlobals implementation.
|
| - virtual ppapi::ResourceTracker* GetResourceTracker() override;
|
| - virtual ppapi::VarTracker* GetVarTracker() override;
|
| - virtual ppapi::CallbackTracker* GetCallbackTrackerForInstance(
|
| + ppapi::ResourceTracker* GetResourceTracker() override;
|
| + ppapi::VarTracker* GetVarTracker() override;
|
| + ppapi::CallbackTracker* GetCallbackTrackerForInstance(
|
| PP_Instance instance) override;
|
| - virtual ppapi::thunk::PPB_Instance_API* GetInstanceAPI(PP_Instance instance)
|
| - override;
|
| - virtual ppapi::thunk::ResourceCreationAPI* GetResourceCreationAPI(
|
| + ppapi::thunk::PPB_Instance_API* GetInstanceAPI(PP_Instance instance) override;
|
| + ppapi::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 ppapi::MessageLoopShared* GetCurrentMessageLoop() override;
|
| - virtual base::TaskRunner* GetFileTaskRunner() 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;
|
| + ppapi::MessageLoopShared* GetCurrentMessageLoop() override;
|
| + base::TaskRunner* GetFileTaskRunner() override;
|
|
|
| HostVarTracker* host_var_tracker() { return &host_var_tracker_; }
|
|
|
| @@ -88,7 +87,7 @@ class HostGlobals : public ppapi::PpapiGlobals {
|
|
|
| private:
|
| // PpapiGlobals overrides.
|
| - virtual bool IsHostGlobals() const override;
|
| + bool IsHostGlobals() const override;
|
|
|
| static HostGlobals* host_globals_;
|
|
|
|
|