| Index: content/renderer/pepper/pepper_browser_connection.cc
|
| ===================================================================
|
| --- content/renderer/pepper/pepper_browser_connection.cc (revision 214423)
|
| +++ content/renderer/pepper/pepper_browser_connection.cc (working copy)
|
| @@ -7,7 +7,6 @@
|
| #include <limits>
|
|
|
| #include "base/logging.h"
|
| -#include "content/renderer/pepper/pepper_helper_impl.h"
|
| #include "content/renderer/render_view_impl.h"
|
| #include "ipc/ipc_message_macros.h"
|
| #include "ppapi/proxy/ppapi_messages.h"
|
| @@ -15,8 +14,9 @@
|
|
|
| namespace content {
|
|
|
| -PepperBrowserConnection::PepperBrowserConnection(PepperHelperImpl* helper)
|
| - : helper_(helper),
|
| +PepperBrowserConnection::PepperBrowserConnection(RenderView* render_view)
|
| + : RenderViewObserver(render_view),
|
| + RenderViewObserverTracker<PepperBrowserConnection>(render_view),
|
| next_sequence_number_(1) {
|
| }
|
|
|
| @@ -42,8 +42,8 @@
|
| int32_t sequence_number = GetNextSequence();
|
| pending_create_map_[sequence_number] = callback;
|
| ppapi::proxy::ResourceMessageCallParams params(0, sequence_number);
|
| - helper_->Send(new PpapiHostMsg_CreateResourceHostFromHost(
|
| - helper_->routing_id(),
|
| + Send(new PpapiHostMsg_CreateResourceHostFromHost(
|
| + routing_id(),
|
| child_process_id,
|
| params,
|
| instance,
|
| @@ -57,8 +57,8 @@
|
| int32_t sequence_number = GetNextSequence();
|
| get_info_map_[sequence_number] = callback;
|
| ppapi::proxy::ResourceMessageCallParams params(resource, sequence_number);
|
| - helper_->Send(new PpapiHostMsg_FileRef_GetInfoForRenderer(
|
| - helper_->routing_id(), child_process_id, params));
|
| + Send(new PpapiHostMsg_FileRef_GetInfoForRenderer(
|
| + routing_id(), child_process_id, params));
|
| }
|
|
|
| void PepperBrowserConnection::OnMsgCreateResourceHostFromHostReply(
|
|
|