Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(1529)

Issues Search
    My Issues | Starred     Open | Closed | All

Unified Diff: content/renderer/pepper/mock_plugin_delegate.h

Issue 20165002: Move webkit/plugins/ppapi to content/renderer/pepper. (Closed) Base URL: svn://chrome-svn/chrome/trunk/src/
Patch Set: more more clang fun Created 7 years, 5 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « content/renderer/pepper/mock_platform_image_2d.cc ('k') | content/renderer/pepper/mock_plugin_delegate.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: content/renderer/pepper/mock_plugin_delegate.h
===================================================================
--- content/renderer/pepper/mock_plugin_delegate.h (revision 213482)
+++ content/renderer/pepper/mock_plugin_delegate.h (working copy)
@@ -2,10 +2,10 @@
// Use of this source code is governed by a BSD-style license that can be
// found in the LICENSE file.
-#ifndef WEBKIT_PLUGINS_PPAPI_MOCK_PLUGIN_DELEGATE_H_
-#define WEBKIT_PLUGINS_PPAPI_MOCK_PLUGIN_DELEGATE_H_
+#ifndef CONTENT_RENDERER_PEPPER_MOCK_PLUGIN_DELEGATE_H_
+#define CONTENT_RENDERER_PEPPER_MOCK_PLUGIN_DELEGATE_H_
-#include "webkit/plugins/ppapi/plugin_delegate.h"
+#include "content/renderer/pepper/plugin_delegate.h"
struct PP_NetAddress_Private;
namespace ppapi { class PPB_X509Certificate_Fields; }
@@ -18,131 +18,141 @@
MockPluginDelegate();
virtual ~MockPluginDelegate();
- virtual void PluginFocusChanged(PluginInstanceImpl* instance, bool focused);
- virtual void PluginTextInputTypeChanged(PluginInstanceImpl* instance);
- virtual void PluginCaretPositionChanged(PluginInstanceImpl* instance);
- virtual void PluginRequestedCancelComposition(PluginInstanceImpl* instance);
- virtual void PluginSelectionChanged(PluginInstanceImpl* instance);
+ virtual void PluginFocusChanged(PluginInstanceImpl* instance,
+ bool focused) OVERRIDE;
+ virtual void PluginTextInputTypeChanged(
+ PluginInstanceImpl* instance) OVERRIDE;
+ virtual void PluginCaretPositionChanged(
+ PluginInstanceImpl* instance) OVERRIDE;
+ virtual void PluginRequestedCancelComposition(
+ PluginInstanceImpl* instance) OVERRIDE;
+ virtual void PluginSelectionChanged(PluginInstanceImpl* instance) OVERRIDE;
virtual void SimulateImeSetComposition(
const base::string16& text,
const std::vector<WebKit::WebCompositionUnderline>& underlines,
int selection_start,
- int selection_end);
- virtual void SimulateImeConfirmComposition(const base::string16& text);
- virtual void PluginCrashed(PluginInstanceImpl* instance);
- virtual void InstanceCreated(PluginInstanceImpl* instance);
- virtual void InstanceDeleted(PluginInstanceImpl* instance);
+ int selection_end) OVERRIDE;
+ virtual void SimulateImeConfirmComposition(
+ const base::string16& text) OVERRIDE;
+ virtual void PluginCrashed(PluginInstanceImpl* instance) OVERRIDE;
+ virtual void InstanceCreated(PluginInstanceImpl* instance) OVERRIDE;
+ virtual void InstanceDeleted(PluginInstanceImpl* instance) OVERRIDE;
virtual scoped_ptr< ::ppapi::thunk::ResourceCreationAPI>
- CreateResourceCreationAPI(PluginInstanceImpl* instance);
- virtual SkBitmap* GetSadPluginBitmap();
+ CreateResourceCreationAPI(PluginInstanceImpl* instance) OVERRIDE;
+ virtual SkBitmap* GetSadPluginBitmap() OVERRIDE;
virtual WebKit::WebPlugin* CreatePluginReplacement(
- const base::FilePath& file_path);
- virtual PlatformImage2D* CreateImage2D(int width, int height);
+ const base::FilePath& file_path) OVERRIDE;
+ virtual PlatformImage2D* CreateImage2D(int width, int height) OVERRIDE;
virtual PlatformGraphics2D* GetGraphics2D(PluginInstanceImpl* instance,
- PP_Resource graphics_2d);
- virtual PlatformContext3D* CreateContext3D();
+ PP_Resource graphics_2d) OVERRIDE;
+ virtual PlatformContext3D* CreateContext3D() OVERRIDE;
virtual PlatformVideoDecoder* CreateVideoDecoder(
media::VideoDecodeAccelerator::Client* client,
- int32 command_buffer_route_id);
+ int32 command_buffer_route_id) OVERRIDE;
virtual PlatformVideoCapture* CreateVideoCapture(
const std::string& device_id,
const GURL& document_url,
- PlatformVideoCaptureEventHandler* handler);
- virtual uint32_t GetAudioHardwareOutputSampleRate();
- virtual uint32_t GetAudioHardwareOutputBufferSize();
+ PlatformVideoCaptureEventHandler* handler) OVERRIDE;
+ virtual uint32_t GetAudioHardwareOutputSampleRate() OVERRIDE;
+ virtual uint32_t GetAudioHardwareOutputBufferSize() OVERRIDE;
virtual PlatformAudioOutput* CreateAudioOutput(
uint32_t sample_rate,
uint32_t sample_count,
- PlatformAudioOutputClient* client);
+ PlatformAudioOutputClient* client) OVERRIDE;
virtual PlatformAudioInput* CreateAudioInput(
const std::string& device_id,
const GURL& document_url,
uint32_t sample_rate,
uint32_t sample_count,
- PlatformAudioInputClient* client);
- virtual Broker* ConnectToBroker(PPB_Broker_Impl* client);
+ PlatformAudioInputClient* client) OVERRIDE;
+ virtual Broker* ConnectToBroker(PPB_Broker_Impl* client) OVERRIDE;
virtual void NumberOfFindResultsChanged(int identifier,
int total,
- bool final_result);
- virtual void SelectedFindResultChanged(int identifier, int index);
+ bool final_result) OVERRIDE;
+ virtual void SelectedFindResultChanged(int identifier, int index) OVERRIDE;
virtual bool AsyncOpenFile(const base::FilePath& path,
int flags,
- const AsyncOpenFileCallback& callback);
+ const AsyncOpenFileCallback& callback) OVERRIDE;
virtual void AsyncOpenFileSystemURL(
const GURL& path,
int flags,
- const AsyncOpenFileSystemURLCallback& callback);
+ const AsyncOpenFileSystemURLCallback& callback) OVERRIDE;
virtual bool IsFileSystemOpened(PP_Instance instance,
- PP_Resource resource) const;
- virtual PP_FileSystemType GetFileSystemType(PP_Instance instance,
- PP_Resource resource) const;
+ PP_Resource resource) const OVERRIDE;
+ virtual PP_FileSystemType GetFileSystemType(
+ PP_Instance instance,
+ PP_Resource resource) const OVERRIDE;
virtual GURL GetFileSystemRootUrl(PP_Instance instance,
- PP_Resource resource) const;
+ PP_Resource resource) const OVERRIDE;
virtual void MakeDirectory(
const GURL& path,
bool recursive,
- const StatusCallback& callback);
+ const StatusCallback& callback) OVERRIDE;
virtual void Query(const GURL& path,
const MetadataCallback& success_callback,
- const StatusCallback& error_callback);
+ const StatusCallback& error_callback) OVERRIDE;
virtual void ReadDirectoryEntries(
const GURL& path,
const ReadDirectoryCallback& success_callback,
- const StatusCallback& error_callback);
+ const StatusCallback& error_callback) OVERRIDE;
virtual void Touch(const GURL& path,
const base::Time& last_access_time,
const base::Time& last_modified_time,
- const StatusCallback& callback);
+ const StatusCallback& callback) OVERRIDE;
virtual void SetLength(const GURL& path,
int64_t length,
- const StatusCallback& callback);
+ const StatusCallback& callback) OVERRIDE;
virtual void Delete(const GURL& path,
- const StatusCallback& callback);
+ const StatusCallback& callback) OVERRIDE;
virtual void Rename(const GURL& file_path,
const GURL& new_file_path,
- const StatusCallback& callback);
+ const StatusCallback& callback) OVERRIDE;
virtual void ReadDirectory(
const GURL& directory_path,
const ReadDirectoryCallback& success_callback,
- const StatusCallback& error_callback);
- virtual void QueryAvailableSpace(const GURL& origin,
- quota::StorageType type,
- const AvailableSpaceCallback& callback);
- virtual void WillUpdateFile(const GURL& file_path);
- virtual void DidUpdateFile(const GURL& file_path, int64_t delta);
- virtual void SyncGetFileSystemPlatformPath(const GURL& url,
- base::FilePath* platform_path);
+ const StatusCallback& error_callback) OVERRIDE;
+ virtual void QueryAvailableSpace(
+ const GURL& origin,
+ quota::StorageType type,
+ const AvailableSpaceCallback& callback) OVERRIDE;
+ virtual void WillUpdateFile(const GURL& file_path) OVERRIDE;
+ virtual void DidUpdateFile(const GURL& file_path, int64_t delta) OVERRIDE;
+ virtual void SyncGetFileSystemPlatformPath(
+ const GURL& url,
+ base::FilePath* platform_path) OVERRIDE;
virtual scoped_refptr<base::MessageLoopProxy>
- GetFileThreadMessageLoopProxy();
- virtual uint32 TCPSocketCreate();
+ GetFileThreadMessageLoopProxy() OVERRIDE;
+ virtual uint32 TCPSocketCreate() OVERRIDE;
virtual void TCPSocketConnect(PPB_TCPSocket_Private_Impl* socket,
uint32 socket_id,
const std::string& host,
- uint16_t port);
+ uint16_t port) OVERRIDE;
virtual void TCPSocketConnectWithNetAddress(
PPB_TCPSocket_Private_Impl* socket,
uint32 socket_id,
- const PP_NetAddress_Private& addr);
+ const PP_NetAddress_Private& addr) OVERRIDE;
virtual void TCPSocketSSLHandshake(
uint32 socket_id,
const std::string& server_name,
uint16_t server_port,
const std::vector<std::vector<char> >& trusted_certs,
- const std::vector<std::vector<char> >& untrusted_certs);
- virtual void TCPSocketRead(uint32 socket_id, int32_t bytes_to_read);
- virtual void TCPSocketWrite(uint32 socket_id, const std::string& buffer);
- virtual void TCPSocketDisconnect(uint32 socket_id);
- virtual void TCPSocketSetOption(uint32 socket_id,
- PP_TCPSocket_Option name,
- const ::ppapi::SocketOptionData& value);
+ const std::vector<std::vector<char> >& untrusted_certs) OVERRIDE;
+ virtual void TCPSocketRead(uint32 socket_id, int32_t bytes_to_read) OVERRIDE;
+ virtual void TCPSocketWrite(uint32 socket_id,
+ const std::string& buffer) OVERRIDE;
+ virtual void TCPSocketDisconnect(uint32 socket_id) OVERRIDE;
+ virtual void TCPSocketSetOption(
+ uint32 socket_id,
+ PP_TCPSocket_Option name,
+ const ::ppapi::SocketOptionData& value) OVERRIDE;
virtual void RegisterTCPSocket(PPB_TCPSocket_Private_Impl* socket,
- uint32 socket_id);
+ uint32 socket_id) OVERRIDE;
virtual void TCPServerSocketListen(PP_Resource socket_resource,
const PP_NetAddress_Private& addr,
- int32_t backlog);
- virtual void TCPServerSocketAccept(uint32 server_socket_id);
+ int32_t backlog) OVERRIDE;
+ virtual void TCPServerSocketAccept(uint32 server_socket_id) OVERRIDE;
virtual void TCPServerSocketStopListening(PP_Resource socket_resource,
- uint32 socket_id);
+ uint32 socket_id) OVERRIDE;
// Add/remove a network list observer.
virtual bool AddNetworkListObserver(
webkit_glue::NetworkListObserver* observer) OVERRIDE;
@@ -150,48 +160,46 @@
webkit_glue::NetworkListObserver* observer) OVERRIDE;
virtual bool X509CertificateParseDER(
const std::vector<char>& der,
- ::ppapi::PPB_X509Certificate_Fields* fields);
+ ::ppapi::PPB_X509Certificate_Fields* fields) OVERRIDE;
virtual FullscreenContainer* CreateFullscreenContainer(
- PluginInstanceImpl* instance);
- virtual gfx::Size GetScreenSize();
- virtual std::string GetDefaultEncoding();
+ PluginInstanceImpl* instance) OVERRIDE;
+ virtual gfx::Size GetScreenSize() OVERRIDE;
+ virtual std::string GetDefaultEncoding() OVERRIDE;
virtual void ZoomLimitsChanged(double minimum_factor,
- double maximum_factor);
- virtual void DidStartLoading();
- virtual void DidStopLoading();
- virtual void SetContentRestriction(int restrictions);
- virtual void SaveURLAs(const GURL& url);
- virtual base::SharedMemory* CreateAnonymousSharedMemory(size_t size);
- virtual ::ppapi::Preferences GetPreferences();
- virtual bool LockMouse(PluginInstanceImpl* instance);
- virtual void UnlockMouse(PluginInstanceImpl* instance);
- virtual bool IsMouseLocked(PluginInstanceImpl* instance);
+ double maximum_factor) OVERRIDE;
+ virtual base::SharedMemory* CreateAnonymousSharedMemory(size_t size) OVERRIDE;
+ virtual ::ppapi::Preferences GetPreferences() OVERRIDE;
+ virtual bool LockMouse(PluginInstanceImpl* instance) OVERRIDE;
+ virtual void UnlockMouse(PluginInstanceImpl* instance) OVERRIDE;
+ virtual bool IsMouseLocked(PluginInstanceImpl* instance) OVERRIDE;
virtual void DidChangeCursor(PluginInstanceImpl* instance,
- const WebKit::WebCursorInfo& cursor);
- virtual void DidReceiveMouseEvent(PluginInstanceImpl* instance);
+ const WebKit::WebCursorInfo& cursor) OVERRIDE;
+ virtual void DidReceiveMouseEvent(PluginInstanceImpl* instance) OVERRIDE;
virtual void SampleGamepads(WebKit::WebGamepads* data) OVERRIDE;
- virtual bool IsInFullscreenMode();
- virtual bool IsPageVisible() const;
- virtual int EnumerateDevices(PP_DeviceType_Dev type,
- const EnumerateDevicesCallback& callback);
- virtual void StopEnumerateDevices(int request_id);
+ virtual bool IsInFullscreenMode() OVERRIDE;
+ virtual bool IsPageVisible() const OVERRIDE;
+ virtual int EnumerateDevices(
+ PP_DeviceType_Dev type,
+ const EnumerateDevicesCallback& callback) OVERRIDE;
+ virtual void StopEnumerateDevices(int request_id) OVERRIDE;
virtual IPC::PlatformFileForTransit ShareHandleWithRemote(
base::PlatformFile handle,
base::ProcessId target_process_id,
- bool should_close_source) const;
- virtual bool IsRunningInProcess(PP_Instance instance) const;
- virtual void HandleDocumentLoad(PluginInstanceImpl* instance,
- const WebKit::WebURLResponse& response);
+ bool should_close_source) const OVERRIDE;
+ virtual bool IsRunningInProcess(PP_Instance instance) const OVERRIDE;
+ virtual void HandleDocumentLoad(
+ PluginInstanceImpl* instance,
+ const WebKit::WebURLResponse& response) OVERRIDE;
virtual content::RendererPpapiHost* CreateExternalPluginModule(
scoped_refptr<PluginModule> module,
const base::FilePath& path,
::ppapi::PpapiPermissions permissions,
const IPC::ChannelHandle& channel_handle,
base::ProcessId plugin_pid,
- int plugin_child_id);
+ int plugin_child_id) OVERRIDE;
};
} // namespace ppapi
} // namespace webkit
-#endif // WEBKIT_PLUGINS_PPAPI_MOCK_PLUGIN_DELEGATE_H_
+#endif // CONTENT_RENDERER_PEPPER_MOCK_PLUGIN_DELEGATE_H_
« no previous file with comments | « content/renderer/pepper/mock_platform_image_2d.cc ('k') | content/renderer/pepper/mock_plugin_delegate.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698