diff options
Diffstat (limited to 'content/browser/renderer_host/pepper')
29 files changed, 91 insertions, 91 deletions
diff --git a/content/browser/renderer_host/pepper/browser_ppapi_host_impl.h b/content/browser/renderer_host/pepper/browser_ppapi_host_impl.h index 43ae426..932fb09 100644 --- a/content/browser/renderer_host/pepper/browser_ppapi_host_impl.h +++ b/content/browser/renderer_host/pepper/browser_ppapi_host_impl.h @@ -45,20 +45,20 @@ class CONTENT_EXPORT BrowserPpapiHostImpl : public BrowserPpapiHost { virtual ~BrowserPpapiHostImpl(); // BrowserPpapiHost. - virtual ppapi::host::PpapiHost* GetPpapiHost() OVERRIDE; - virtual base::ProcessHandle GetPluginProcessHandle() const OVERRIDE; - virtual bool IsValidInstance(PP_Instance instance) const OVERRIDE; + virtual ppapi::host::PpapiHost* GetPpapiHost() override; + virtual base::ProcessHandle GetPluginProcessHandle() const override; + virtual bool IsValidInstance(PP_Instance instance) const override; virtual bool GetRenderFrameIDsForInstance(PP_Instance instance, int* render_process_id, int* render_frame_id) const - OVERRIDE; - virtual const std::string& GetPluginName() OVERRIDE; - virtual const base::FilePath& GetPluginPath() OVERRIDE; - virtual const base::FilePath& GetProfileDataDirectory() OVERRIDE; - virtual GURL GetDocumentURLForInstance(PP_Instance instance) OVERRIDE; - virtual GURL GetPluginURLForInstance(PP_Instance instance) OVERRIDE; + override; + virtual const std::string& GetPluginName() override; + virtual const base::FilePath& GetPluginPath() override; + virtual const base::FilePath& GetProfileDataDirectory() override; + virtual GURL GetDocumentURLForInstance(PP_Instance instance) override; + virtual GURL GetPluginURLForInstance(PP_Instance instance) override; virtual void SetOnKeepaliveCallback( - const BrowserPpapiHost::OnKeepaliveCallback& callback) OVERRIDE; + const BrowserPpapiHost::OnKeepaliveCallback& callback) override; void set_plugin_process_handle(base::ProcessHandle handle) { plugin_process_handle_ = handle; @@ -93,7 +93,7 @@ class CONTENT_EXPORT BrowserPpapiHostImpl : public BrowserPpapiHost { BrowserPpapiHostImpl* browser_ppapi_host_impl); // IPC::MessageFilter. - virtual bool OnMessageReceived(const IPC::Message& msg) OVERRIDE; + virtual bool OnMessageReceived(const IPC::Message& msg) override; void OnHostDestroyed(); diff --git a/content/browser/renderer_host/pepper/content_browser_pepper_host_factory.h b/content/browser/renderer_host/pepper/content_browser_pepper_host_factory.h index 04267a3..31a0a0e 100644 --- a/content/browser/renderer_host/pepper/content_browser_pepper_host_factory.h +++ b/content/browser/renderer_host/pepper/content_browser_pepper_host_factory.h @@ -32,7 +32,7 @@ class ContentBrowserPepperHostFactory : public ppapi::host::HostFactory { ppapi::host::PpapiHost* host, const ppapi::proxy::ResourceMessageCallParams& params, PP_Instance instance, - const IPC::Message& message) OVERRIDE; + const IPC::Message& message) override; // Creates ResourceHost for already accepted TCP |socket|. In the case of // failure returns wrapped NULL. diff --git a/content/browser/renderer_host/pepper/pepper_browser_font_singleton_host.cc b/content/browser/renderer_host/pepper/pepper_browser_font_singleton_host.cc index 40c13df..08f4180 100644 --- a/content/browser/renderer_host/pepper/pepper_browser_font_singleton_host.cc +++ b/content/browser/renderer_host/pepper/pepper_browser_font_singleton_host.cc @@ -24,10 +24,10 @@ class FontMessageFilter : public ppapi::host::ResourceMessageFilter { // ppapi::host::ResourceMessageFilter implementation. virtual scoped_refptr<base::TaskRunner> OverrideTaskRunnerForMessage( - const IPC::Message& msg) OVERRIDE; + const IPC::Message& msg) override; virtual int32_t OnResourceMessageReceived( const IPC::Message& msg, - ppapi::host::HostMessageContext* context) OVERRIDE; + ppapi::host::HostMessageContext* context) override; private: virtual ~FontMessageFilter(); diff --git a/content/browser/renderer_host/pepper/pepper_external_file_ref_backend.h b/content/browser/renderer_host/pepper/pepper_external_file_ref_backend.h index 953db66..693349e 100644 --- a/content/browser/renderer_host/pepper/pepper_external_file_ref_backend.h +++ b/content/browser/renderer_host/pepper/pepper_external_file_ref_backend.h @@ -29,25 +29,25 @@ class PepperExternalFileRefBackend : public PepperFileRefBackend { // PepperFileRefBackend overrides. virtual int32_t MakeDirectory(ppapi::host::ReplyMessageContext context, - int32_t make_directory_flags) OVERRIDE; + int32_t make_directory_flags) override; virtual int32_t Touch(ppapi::host::ReplyMessageContext context, PP_Time last_accessed_time, - PP_Time last_modified_time) OVERRIDE; - virtual int32_t Delete(ppapi::host::ReplyMessageContext context) OVERRIDE; + PP_Time last_modified_time) override; + virtual int32_t Delete(ppapi::host::ReplyMessageContext context) override; virtual int32_t Rename(ppapi::host::ReplyMessageContext context, - PepperFileRefHost* new_file_ref) OVERRIDE; - virtual int32_t Query(ppapi::host::ReplyMessageContext context) OVERRIDE; + PepperFileRefHost* new_file_ref) override; + virtual int32_t Query(ppapi::host::ReplyMessageContext context) override; virtual int32_t ReadDirectoryEntries(ppapi::host::ReplyMessageContext context) - OVERRIDE; + override; virtual int32_t GetAbsolutePath(ppapi::host::ReplyMessageContext context) - OVERRIDE; - virtual storage::FileSystemURL GetFileSystemURL() const OVERRIDE; - virtual base::FilePath GetExternalFilePath() const OVERRIDE; + override; + virtual storage::FileSystemURL GetFileSystemURL() const override; + virtual base::FilePath GetExternalFilePath() const override; - virtual int32_t CanRead() const OVERRIDE; - virtual int32_t CanWrite() const OVERRIDE; - virtual int32_t CanCreate() const OVERRIDE; - virtual int32_t CanReadWrite() const OVERRIDE; + virtual int32_t CanRead() const override; + virtual int32_t CanWrite() const override; + virtual int32_t CanCreate() const override; + virtual int32_t CanReadWrite() const override; private: // Generic reply callback. diff --git a/content/browser/renderer_host/pepper/pepper_file_io_host.h b/content/browser/renderer_host/pepper/pepper_file_io_host.h index 9b7b570..4930535 100644 --- a/content/browser/renderer_host/pepper/pepper_file_io_host.h +++ b/content/browser/renderer_host/pepper/pepper_file_io_host.h @@ -43,7 +43,7 @@ class PepperFileIOHost : public ppapi::host::ResourceHost, // ppapi::host::ResourceHost override. virtual int32_t OnResourceMessageReceived( const IPC::Message& msg, - ppapi::host::HostMessageContext* context) OVERRIDE; + ppapi::host::HostMessageContext* context) override; struct UIThreadStuff { UIThreadStuff(); diff --git a/content/browser/renderer_host/pepper/pepper_file_ref_host.h b/content/browser/renderer_host/pepper/pepper_file_ref_host.h index 62497e4..60e814b 100644 --- a/content/browser/renderer_host/pepper/pepper_file_ref_host.h +++ b/content/browser/renderer_host/pepper/pepper_file_ref_host.h @@ -70,8 +70,8 @@ class CONTENT_EXPORT PepperFileRefHost // ResourceHost overrides. virtual int32_t OnResourceMessageReceived( const IPC::Message& msg, - ppapi::host::HostMessageContext* context) OVERRIDE; - virtual bool IsFileRefHost() OVERRIDE; + ppapi::host::HostMessageContext* context) override; + virtual bool IsFileRefHost() override; // Required to support Rename(). PP_FileSystemType GetFileSystemType() const; diff --git a/content/browser/renderer_host/pepper/pepper_file_system_browser_host.h b/content/browser/renderer_host/pepper/pepper_file_system_browser_host.h index de132ac..7a63699 100644 --- a/content/browser/renderer_host/pepper/pepper_file_system_browser_host.h +++ b/content/browser/renderer_host/pepper/pepper_file_system_browser_host.h @@ -48,8 +48,8 @@ class CONTENT_EXPORT PepperFileSystemBrowserHost // ppapi::host::ResourceHost overrides. virtual int32_t OnResourceMessageReceived( const IPC::Message& msg, - ppapi::host::HostMessageContext* context) OVERRIDE; - virtual bool IsFileSystemHost() OVERRIDE; + ppapi::host::HostMessageContext* context) override; + virtual bool IsFileSystemHost() override; // Supports FileRefs direct access on the host side. PP_FileSystemType GetType() const { return type_; } diff --git a/content/browser/renderer_host/pepper/pepper_file_system_browser_host_unittest.cc b/content/browser/renderer_host/pepper/pepper_file_system_browser_host_unittest.cc index 8aa144c..72b6e2d 100644 --- a/content/browser/renderer_host/pepper/pepper_file_system_browser_host_unittest.cc +++ b/content/browser/renderer_host/pepper/pepper_file_system_browser_host_unittest.cc @@ -21,7 +21,7 @@ class PepperFileSystemBrowserHostTest : public testing::Test, PepperFileSystemBrowserHostTest() {} virtual ~PepperFileSystemBrowserHostTest() {} - virtual void SetUp() OVERRIDE { + virtual void SetUp() override { PP_Instance pp_instance = 12345; PP_Resource pp_resource = 67890; host_.reset(new PepperFileSystemBrowserHost(GetBrowserPpapiHost(), @@ -30,7 +30,7 @@ class PepperFileSystemBrowserHostTest : public testing::Test, PP_FILESYSTEMTYPE_ISOLATED)); } - virtual void TearDown() OVERRIDE { host_.reset(); } + virtual void TearDown() override { host_.reset(); } protected: std::string GeneratePluginId(const std::string& mime_type) { diff --git a/content/browser/renderer_host/pepper/pepper_flash_file_message_filter.h b/content/browser/renderer_host/pepper/pepper_flash_file_message_filter.h index ab21076..923a508 100644 --- a/content/browser/renderer_host/pepper/pepper_flash_file_message_filter.h +++ b/content/browser/renderer_host/pepper/pepper_flash_file_message_filter.h @@ -47,10 +47,10 @@ class PepperFlashFileMessageFilter : public ppapi::host::ResourceMessageFilter { // ppapi::host::ResourceMessageFilter overrides. virtual scoped_refptr<base::TaskRunner> OverrideTaskRunnerForMessage( - const IPC::Message& msg) OVERRIDE; + const IPC::Message& msg) override; virtual int32_t OnResourceMessageReceived( const IPC::Message& msg, - ppapi::host::HostMessageContext* context) OVERRIDE; + ppapi::host::HostMessageContext* context) override; int32_t OnOpenFile(ppapi::host::HostMessageContext* context, const ppapi::PepperFilePath& path, diff --git a/content/browser/renderer_host/pepper/pepper_gamepad_host.h b/content/browser/renderer_host/pepper/pepper_gamepad_host.h index c9f2c18..a64692c 100644 --- a/content/browser/renderer_host/pepper/pepper_gamepad_host.h +++ b/content/browser/renderer_host/pepper/pepper_gamepad_host.h @@ -41,15 +41,15 @@ class CONTENT_EXPORT PepperGamepadHost : virtual int32_t OnResourceMessageReceived( const IPC::Message& msg, - ppapi::host::HostMessageContext* context) OVERRIDE; + ppapi::host::HostMessageContext* context) override; // GamepadConsumer implementation. virtual void OnGamepadConnected( unsigned index, - const blink::WebGamepad& gamepad) OVERRIDE {} + const blink::WebGamepad& gamepad) override {} virtual void OnGamepadDisconnected( unsigned index, - const blink::WebGamepad& gamepad) OVERRIDE {} + const blink::WebGamepad& gamepad) override {} private: int32_t OnRequestMemory(ppapi::host::HostMessageContext* context); diff --git a/content/browser/renderer_host/pepper/pepper_host_resolver_message_filter.h b/content/browser/renderer_host/pepper/pepper_host_resolver_message_filter.h index 8fb404d..45675c1 100644 --- a/content/browser/renderer_host/pepper/pepper_host_resolver_message_filter.h +++ b/content/browser/renderer_host/pepper/pepper_host_resolver_message_filter.h @@ -50,10 +50,10 @@ class CONTENT_EXPORT PepperHostResolverMessageFilter // ppapi::host::ResourceMessageFilter overrides. virtual scoped_refptr<base::TaskRunner> OverrideTaskRunnerForMessage( - const IPC::Message& message) OVERRIDE; + const IPC::Message& message) override; virtual int32_t OnResourceMessageReceived( const IPC::Message& msg, - ppapi::host::HostMessageContext* context) OVERRIDE; + ppapi::host::HostMessageContext* context) override; int32_t OnMsgResolve(const ppapi::host::HostMessageContext* context, const ppapi::HostPortPair& host_port, diff --git a/content/browser/renderer_host/pepper/pepper_internal_file_ref_backend.h b/content/browser/renderer_host/pepper/pepper_internal_file_ref_backend.h index 8b88a42..8bd1053 100644 --- a/content/browser/renderer_host/pepper/pepper_internal_file_ref_backend.h +++ b/content/browser/renderer_host/pepper/pepper_internal_file_ref_backend.h @@ -32,25 +32,25 @@ class PepperInternalFileRefBackend : public PepperFileRefBackend { // PepperFileRefBackend overrides. virtual int32_t MakeDirectory(ppapi::host::ReplyMessageContext context, - int32_t make_directory_flags) OVERRIDE; + int32_t make_directory_flags) override; virtual int32_t Touch(ppapi::host::ReplyMessageContext context, PP_Time last_accessed_time, - PP_Time last_modified_time) OVERRIDE; - virtual int32_t Delete(ppapi::host::ReplyMessageContext context) OVERRIDE; + PP_Time last_modified_time) override; + virtual int32_t Delete(ppapi::host::ReplyMessageContext context) override; virtual int32_t Rename(ppapi::host::ReplyMessageContext context, - PepperFileRefHost* new_file_ref) OVERRIDE; - virtual int32_t Query(ppapi::host::ReplyMessageContext context) OVERRIDE; + PepperFileRefHost* new_file_ref) override; + virtual int32_t Query(ppapi::host::ReplyMessageContext context) override; virtual int32_t ReadDirectoryEntries(ppapi::host::ReplyMessageContext context) - OVERRIDE; + override; virtual int32_t GetAbsolutePath(ppapi::host::ReplyMessageContext context) - OVERRIDE; - virtual storage::FileSystemURL GetFileSystemURL() const OVERRIDE; - virtual base::FilePath GetExternalFilePath() const OVERRIDE; - - virtual int32_t CanRead() const OVERRIDE; - virtual int32_t CanWrite() const OVERRIDE; - virtual int32_t CanCreate() const OVERRIDE; - virtual int32_t CanReadWrite() const OVERRIDE; + override; + virtual storage::FileSystemURL GetFileSystemURL() const override; + virtual base::FilePath GetExternalFilePath() const override; + + virtual int32_t CanRead() const override; + virtual int32_t CanWrite() const override; + virtual int32_t CanCreate() const override; + virtual int32_t CanReadWrite() const override; private: // Generic reply callback. diff --git a/content/browser/renderer_host/pepper/pepper_message_filter.h b/content/browser/renderer_host/pepper/pepper_message_filter.h index 68dac47..1767cf8 100644 --- a/content/browser/renderer_host/pepper/pepper_message_filter.h +++ b/content/browser/renderer_host/pepper/pepper_message_filter.h @@ -24,7 +24,7 @@ class PepperMessageFilter : public BrowserMessageFilter { PepperMessageFilter(); // BrowserMessageFilter methods. - virtual bool OnMessageReceived(const IPC::Message& message) OVERRIDE; + virtual bool OnMessageReceived(const IPC::Message& message) override; protected: virtual ~PepperMessageFilter(); diff --git a/content/browser/renderer_host/pepper/pepper_network_monitor_host.h b/content/browser/renderer_host/pepper/pepper_network_monitor_host.h index 12241c5..13886ba 100644 --- a/content/browser/renderer_host/pepper/pepper_network_monitor_host.h +++ b/content/browser/renderer_host/pepper/pepper_network_monitor_host.h @@ -29,7 +29,7 @@ class CONTENT_EXPORT PepperNetworkMonitorHost virtual ~PepperNetworkMonitorHost(); // net::NetworkChangeNotifier::IPAddressObserver interface. - virtual void OnIPAddressChanged() OVERRIDE; + virtual void OnIPAddressChanged() override; private: void OnPermissionCheckResult(bool can_use_network_monitor); diff --git a/content/browser/renderer_host/pepper/pepper_network_proxy_host.h b/content/browser/renderer_host/pepper/pepper_network_proxy_host.h index 28f52b6..3b8aec83 100644 --- a/content/browser/renderer_host/pepper/pepper_network_proxy_host.h +++ b/content/browser/renderer_host/pepper/pepper_network_proxy_host.h @@ -57,7 +57,7 @@ class CONTENT_EXPORT PepperNetworkProxyHost : public ppapi::host::ResourceHost { // ResourceHost implementation. virtual int32_t OnResourceMessageReceived( const IPC::Message& msg, - ppapi::host::HostMessageContext* context) OVERRIDE; + ppapi::host::HostMessageContext* context) override; int32_t OnMsgGetProxyForURL(ppapi::host::HostMessageContext* context, const std::string& url); diff --git a/content/browser/renderer_host/pepper/pepper_print_settings_manager.cc b/content/browser/renderer_host/pepper/pepper_print_settings_manager.cc index 49607090..db9c5d2 100644 --- a/content/browser/renderer_host/pepper/pepper_print_settings_manager.cc +++ b/content/browser/renderer_host/pepper/pepper_print_settings_manager.cc @@ -47,8 +47,8 @@ PP_Rect PrintAreaToPPPrintArea(const gfx::Rect& print_area, class PrintingContextDelegate : public printing::PrintingContext::Delegate { public: // PrintingContext::Delegate methods. - virtual gfx::NativeView GetParentView() OVERRIDE { return NULL; } - virtual std::string GetAppLocale() OVERRIDE { + virtual gfx::NativeView GetParentView() override { return NULL; } + virtual std::string GetAppLocale() override { return GetContentClient()->browser()->GetApplicationLocale(); } }; diff --git a/content/browser/renderer_host/pepper/pepper_print_settings_manager.h b/content/browser/renderer_host/pepper/pepper_print_settings_manager.h index 48a8e9f..2ff5465 100644 --- a/content/browser/renderer_host/pepper/pepper_print_settings_manager.h +++ b/content/browser/renderer_host/pepper/pepper_print_settings_manager.h @@ -36,7 +36,7 @@ class CONTENT_EXPORT PepperPrintSettingsManagerImpl // PepperPrintSettingsManager implementation. virtual void GetDefaultPrintSettings( - PepperPrintSettingsManager::Callback callback) OVERRIDE; + PepperPrintSettingsManager::Callback callback) override; private: DISALLOW_COPY_AND_ASSIGN(PepperPrintSettingsManagerImpl); diff --git a/content/browser/renderer_host/pepper/pepper_printing_host.h b/content/browser/renderer_host/pepper/pepper_printing_host.h index ec95629..327a3b8 100644 --- a/content/browser/renderer_host/pepper/pepper_printing_host.h +++ b/content/browser/renderer_host/pepper/pepper_printing_host.h @@ -27,7 +27,7 @@ class CONTENT_EXPORT PepperPrintingHost : public ppapi::host::ResourceHost { // ppapi::host::ResourceHost implementation. virtual int32_t OnResourceMessageReceived( const IPC::Message& msg, - ppapi::host::HostMessageContext* context) OVERRIDE; + ppapi::host::HostMessageContext* context) override; private: int32_t OnGetDefaultPrintSettings(ppapi::host::HostMessageContext* context); diff --git a/content/browser/renderer_host/pepper/pepper_printing_host_unittest.cc b/content/browser/renderer_host/pepper/pepper_printing_host_unittest.cc index d9780425..c2a9633 100644 --- a/content/browser/renderer_host/pepper/pepper_printing_host_unittest.cc +++ b/content/browser/renderer_host/pepper/pepper_printing_host_unittest.cc @@ -25,7 +25,7 @@ class MockPepperPrintSettingsManager : public PepperPrintSettingsManager { // PepperPrintSettingsManager implementation. virtual void GetDefaultPrintSettings( - PepperPrintSettingsManager::Callback callback) OVERRIDE; + PepperPrintSettingsManager::Callback callback) override; private: PP_PrintSettings_Dev settings_; diff --git a/content/browser/renderer_host/pepper/pepper_renderer_connection.h b/content/browser/renderer_host/pepper/pepper_renderer_connection.h index 5683ab9..14fc112 100644 --- a/content/browser/renderer_host/pepper/pepper_renderer_connection.h +++ b/content/browser/renderer_host/pepper/pepper_renderer_connection.h @@ -36,7 +36,7 @@ class PepperRendererConnection : public BrowserMessageFilter { explicit PepperRendererConnection(int render_process_id); // BrowserMessageFilter overrides. - virtual bool OnMessageReceived(const IPC::Message& msg) OVERRIDE; + virtual bool OnMessageReceived(const IPC::Message& msg) override; private: virtual ~PepperRendererConnection(); diff --git a/content/browser/renderer_host/pepper/pepper_tcp_server_socket_message_filter.h b/content/browser/renderer_host/pepper/pepper_tcp_server_socket_message_filter.h index 43262fc..23d449c 100644 --- a/content/browser/renderer_host/pepper/pepper_tcp_server_socket_message_filter.h +++ b/content/browser/renderer_host/pepper/pepper_tcp_server_socket_message_filter.h @@ -54,10 +54,10 @@ class CONTENT_EXPORT PepperTCPServerSocketMessageFilter // ppapi::host::ResourceMessageFilter overrides. virtual scoped_refptr<base::TaskRunner> OverrideTaskRunnerForMessage( - const IPC::Message& message) OVERRIDE; + const IPC::Message& message) override; virtual int32_t OnResourceMessageReceived( const IPC::Message& msg, - ppapi::host::HostMessageContext* context) OVERRIDE; + ppapi::host::HostMessageContext* context) override; int32_t OnMsgListen(const ppapi::host::HostMessageContext* context, const PP_NetAddress_Private& addr, diff --git a/content/browser/renderer_host/pepper/pepper_tcp_socket_message_filter.h b/content/browser/renderer_host/pepper/pepper_tcp_socket_message_filter.h index 5c4e066..0e4d5cb 100644 --- a/content/browser/renderer_host/pepper/pepper_tcp_socket_message_filter.h +++ b/content/browser/renderer_host/pepper/pepper_tcp_socket_message_filter.h @@ -67,10 +67,10 @@ class CONTENT_EXPORT PepperTCPSocketMessageFilter // ppapi::host::ResourceMessageFilter overrides. virtual scoped_refptr<base::TaskRunner> OverrideTaskRunnerForMessage( - const IPC::Message& message) OVERRIDE; + const IPC::Message& message) override; virtual int32_t OnResourceMessageReceived( const IPC::Message& msg, - ppapi::host::HostMessageContext* context) OVERRIDE; + ppapi::host::HostMessageContext* context) override; int32_t OnMsgBind(const ppapi::host::HostMessageContext* context, const PP_NetAddress_Private& net_addr); diff --git a/content/browser/renderer_host/pepper/pepper_truetype_font_host.h b/content/browser/renderer_host/pepper/pepper_truetype_font_host.h index 2c09ebd..25ef72d 100644 --- a/content/browser/renderer_host/pepper/pepper_truetype_font_host.h +++ b/content/browser/renderer_host/pepper/pepper_truetype_font_host.h @@ -32,7 +32,7 @@ class CONTENT_EXPORT PepperTrueTypeFontHost : public ppapi::host::ResourceHost { virtual int32_t OnResourceMessageReceived( const IPC::Message& msg, - ppapi::host::HostMessageContext* context) OVERRIDE; + ppapi::host::HostMessageContext* context) override; private: int32_t OnHostMsgGetTableTags(ppapi::host::HostMessageContext* context); diff --git a/content/browser/renderer_host/pepper/pepper_truetype_font_linux.cc b/content/browser/renderer_host/pepper/pepper_truetype_font_linux.cc index 9a10e8f..c249a7c 100644 --- a/content/browser/renderer_host/pepper/pepper_truetype_font_linux.cc +++ b/content/browser/renderer_host/pepper/pepper_truetype_font_linux.cc @@ -23,15 +23,15 @@ class PepperTrueTypeFontLinux : public PepperTrueTypeFont { // PepperTrueTypeFont implementation. virtual int32_t Initialize( - ppapi::proxy::SerializedTrueTypeFontDesc* desc) OVERRIDE; - virtual int32_t GetTableTags(std::vector<uint32_t>* tags) OVERRIDE; + ppapi::proxy::SerializedTrueTypeFontDesc* desc) override; + virtual int32_t GetTableTags(std::vector<uint32_t>* tags) override; virtual int32_t GetTable(uint32_t table_tag, int32_t offset, int32_t max_data_length, - std::string* data) OVERRIDE; + std::string* data) override; private: - virtual ~PepperTrueTypeFontLinux() OVERRIDE; + virtual ~PepperTrueTypeFontLinux() override; base::ScopedFD fd_; diff --git a/content/browser/renderer_host/pepper/pepper_truetype_font_list_host.cc b/content/browser/renderer_host/pepper/pepper_truetype_font_list_host.cc index 7479046..177ff12 100644 --- a/content/browser/renderer_host/pepper/pepper_truetype_font_list_host.cc +++ b/content/browser/renderer_host/pepper/pepper_truetype_font_list_host.cc @@ -28,10 +28,10 @@ class FontMessageFilter : public ppapi::host::ResourceMessageFilter { // ppapi::host::ResourceMessageFilter implementation. virtual scoped_refptr<base::TaskRunner> OverrideTaskRunnerForMessage( - const IPC::Message& msg) OVERRIDE; + const IPC::Message& msg) override; virtual int32_t OnResourceMessageReceived( const IPC::Message& msg, - ppapi::host::HostMessageContext* context) OVERRIDE; + ppapi::host::HostMessageContext* context) override; private: virtual ~FontMessageFilter(); diff --git a/content/browser/renderer_host/pepper/pepper_truetype_font_mac.mm b/content/browser/renderer_host/pepper/pepper_truetype_font_mac.mm index 10ebb2f..fb4bc45 100644 --- a/content/browser/renderer_host/pepper/pepper_truetype_font_mac.mm +++ b/content/browser/renderer_host/pepper/pepper_truetype_font_mac.mm @@ -99,15 +99,15 @@ class PepperTrueTypeFontMac : public PepperTrueTypeFont { // PepperTrueTypeFont implementation. virtual int32_t Initialize( - ppapi::proxy::SerializedTrueTypeFontDesc* desc) OVERRIDE; - virtual int32_t GetTableTags(std::vector<uint32_t>* tags) OVERRIDE; + ppapi::proxy::SerializedTrueTypeFontDesc* desc) override; + virtual int32_t GetTableTags(std::vector<uint32_t>* tags) override; virtual int32_t GetTable(uint32_t table_tag, int32_t offset, int32_t max_data_length, - std::string* data) OVERRIDE; + std::string* data) override; private: - virtual ~PepperTrueTypeFontMac() OVERRIDE; + virtual ~PepperTrueTypeFontMac() override; virtual int32_t GetEntireFont(int32_t offset, int32_t max_data_length, diff --git a/content/browser/renderer_host/pepper/pepper_truetype_font_win.cc b/content/browser/renderer_host/pepper/pepper_truetype_font_win.cc index 683f655..6eb36a1 100644 --- a/content/browser/renderer_host/pepper/pepper_truetype_font_win.cc +++ b/content/browser/renderer_host/pepper/pepper_truetype_font_win.cc @@ -27,12 +27,12 @@ class PepperTrueTypeFontWin : public PepperTrueTypeFont { // PepperTrueTypeFont implementation. virtual int32_t Initialize( - ppapi::proxy::SerializedTrueTypeFontDesc* desc) OVERRIDE; - virtual int32_t GetTableTags(std::vector<uint32_t>* tags) OVERRIDE; + ppapi::proxy::SerializedTrueTypeFontDesc* desc) override; + virtual int32_t GetTableTags(std::vector<uint32_t>* tags) override; virtual int32_t GetTable(uint32_t table_tag, int32_t offset, int32_t max_data_length, - std::string* data) OVERRIDE; + std::string* data) override; private: virtual ~PepperTrueTypeFontWin(); diff --git a/content/browser/renderer_host/pepper/pepper_udp_socket_message_filter.h b/content/browser/renderer_host/pepper/pepper_udp_socket_message_filter.h index c28e75a..1a1dccb 100644 --- a/content/browser/renderer_host/pepper/pepper_udp_socket_message_filter.h +++ b/content/browser/renderer_host/pepper/pepper_udp_socket_message_filter.h @@ -58,10 +58,10 @@ class CONTENT_EXPORT PepperUDPSocketMessageFilter private: // ppapi::host::ResourceMessageFilter overrides. virtual scoped_refptr<base::TaskRunner> OverrideTaskRunnerForMessage( - const IPC::Message& message) OVERRIDE; + const IPC::Message& message) override; virtual int32_t OnResourceMessageReceived( const IPC::Message& msg, - ppapi::host::HostMessageContext* context) OVERRIDE; + ppapi::host::HostMessageContext* context) override; int32_t OnMsgSetOption(const ppapi::host::HostMessageContext* context, PP_UDPSocket_Option name, diff --git a/content/browser/renderer_host/pepper/quota_reservation_unittest.cc b/content/browser/renderer_host/pepper/quota_reservation_unittest.cc index ccecb57..ed9d249 100644 --- a/content/browser/renderer_host/pepper/quota_reservation_unittest.cc +++ b/content/browser/renderer_host/pepper/quota_reservation_unittest.cc @@ -39,7 +39,7 @@ class FakeBackend : public QuotaReservationManager::QuotaBackend { const GURL& origin, storage::FileSystemType type, int64 delta, - const QuotaReservationManager::ReserveQuotaCallback& callback) OVERRIDE { + const QuotaReservationManager::ReserveQuotaCallback& callback) override { base::MessageLoopProxy::current()->PostTask( FROM_HERE, base::Bind(base::IgnoreResult(callback), base::File::FILE_OK, delta)); @@ -47,16 +47,16 @@ class FakeBackend : public QuotaReservationManager::QuotaBackend { virtual void ReleaseReservedQuota(const GURL& origin, storage::FileSystemType type, - int64 size) OVERRIDE {} + int64 size) override {} virtual void CommitQuotaUsage(const GURL& origin, storage::FileSystemType type, - int64 delta) OVERRIDE {} + int64 delta) override {} virtual void IncrementDirtyCount(const GURL& origin, - storage::FileSystemType type) OVERRIDE {} + storage::FileSystemType type) override {} virtual void DecrementDirtyCount(const GURL& origin, - storage::FileSystemType type) OVERRIDE {} + storage::FileSystemType type) override {} private: DISALLOW_COPY_AND_ASSIGN(FakeBackend); @@ -69,14 +69,14 @@ class QuotaReservationTest : public testing::Test { QuotaReservationTest() {} virtual ~QuotaReservationTest() {} - virtual void SetUp() OVERRIDE { + virtual void SetUp() override { ASSERT_TRUE(work_dir_.CreateUniqueTempDir()); reservation_manager_.reset(new QuotaReservationManager( scoped_ptr<QuotaReservationManager::QuotaBackend>(new FakeBackend))); } - virtual void TearDown() OVERRIDE { + virtual void TearDown() override { reservation_manager_.reset(); base::RunLoop().RunUntilIdle(); } |