Commit a8ac477c authored by nasko's avatar nasko Committed by Commit bot

Prefix BrowserPluginDelegate methods.

This CL prefixes the DidFinishLoading and DidReceiveData methods in
BrowserPluginDelegate, so they don't conflict with the
WebAssociatedURLLoaderClient versions which currently start with
lowercase letter. As part of the Blink rewrite to match Chromium style,
those will be colliding in MimeHandlerViewContainer.

BUG=582312

Review-Url: https://codereview.chromium.org/2616123002
Cr-Commit-Position: refs/heads/master@{#441994}
parent ec8edae4
......@@ -30,10 +30,10 @@ class CONTENT_EXPORT BrowserPluginDelegate {
virtual void Ready() {}
// Called when plugin document has finished loading.
virtual void DidFinishLoading() {}
virtual void PluginDidFinishLoading() {}
// Called when plugin document receives data.
virtual void DidReceiveData(const char* data, int data_length) {}
virtual void PluginDidReceiveData(const char* data, int data_length) {}
// Sets the instance ID that idenfies the plugin within current render
// process.
......
......@@ -513,12 +513,12 @@ void BrowserPlugin::didReceiveResponse(
void BrowserPlugin::didReceiveData(const char* data, int data_length) {
if (delegate_)
delegate_->DidReceiveData(data, data_length);
delegate_->PluginDidReceiveData(data, data_length);
}
void BrowserPlugin::didFinishLoading() {
if (delegate_)
delegate_->DidFinishLoading();
delegate_->PluginDidFinishLoading();
}
void BrowserPlugin::didFailLoading(const blink::WebURLError& error) {
......
......@@ -175,7 +175,7 @@ bool MimeHandlerViewContainer::OnMessage(const IPC::Message& message) {
return handled;
}
void MimeHandlerViewContainer::DidFinishLoading() {
void MimeHandlerViewContainer::PluginDidFinishLoading() {
DCHECK(!is_embedded_);
CreateMimeHandlerViewGuest();
}
......@@ -184,8 +184,8 @@ void MimeHandlerViewContainer::OnRenderFrameDestroyed() {
g_mime_handler_view_container_map.Get().erase(render_frame());
}
void MimeHandlerViewContainer::DidReceiveData(const char* data,
int data_length) {
void MimeHandlerViewContainer::PluginDidReceiveData(const char* data,
int data_length) {
view_id_ += std::string(data, data_length);
}
......
......@@ -55,8 +55,8 @@ class MimeHandlerViewContainer : public guest_view::GuestViewContainer,
void OnReady() override;
// BrowserPluginDelegate implementation.
void DidFinishLoading() override;
void DidReceiveData(const char* data, int data_length) override;
void PluginDidFinishLoading() override;
void PluginDidReceiveData(const char* data, int data_length) override;
void DidResizeElement(const gfx::Size& new_size) override;
v8::Local<v8::Object> V8ScriptableObject(v8::Isolate*) override;
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment