| Index: content/renderer/pepper_plugin_delegate_impl.cc
|
| diff --git a/content/renderer/pepper_plugin_delegate_impl.cc b/content/renderer/pepper_plugin_delegate_impl.cc
|
| index c061b80df3ec0e18cc24074ef9436566d2e9d721..a8e7d26a1ec5e9ea94b90664328fb686d09cd7ad 100644
|
| --- a/content/renderer/pepper_plugin_delegate_impl.cc
|
| +++ b/content/renderer/pepper_plugin_delegate_impl.cc
|
| @@ -342,21 +342,21 @@ class DispatcherWrapper
|
| base::ProcessHandle plugin_process_handle,
|
| const IPC::ChannelHandle& channel_handle,
|
| PP_Module pp_module,
|
| - pp::proxy::Dispatcher::GetInterfaceFunc local_get_interface);
|
| + ppapi::proxy::Dispatcher::GetInterfaceFunc local_get_interface);
|
|
|
| // OutOfProcessProxy implementation.
|
| virtual const void* GetProxiedInterface(const char* name) {
|
| return dispatcher_->GetProxiedInterface(name);
|
| }
|
| virtual void AddInstance(PP_Instance instance) {
|
| - pp::proxy::HostDispatcher::SetForInstance(instance, dispatcher_.get());
|
| + ppapi::proxy::HostDispatcher::SetForInstance(instance, dispatcher_.get());
|
| }
|
| virtual void RemoveInstance(PP_Instance instance) {
|
| - pp::proxy::HostDispatcher::RemoveForInstance(instance);
|
| + ppapi::proxy::HostDispatcher::RemoveForInstance(instance);
|
| }
|
|
|
| private:
|
| - scoped_ptr<pp::proxy::HostDispatcher> dispatcher_;
|
| + scoped_ptr<ppapi::proxy::HostDispatcher> dispatcher_;
|
| };
|
|
|
| class QuotaCallbackTranslator : public QuotaDispatcher::Callback {
|
| @@ -441,8 +441,8 @@ bool DispatcherWrapper::Init(
|
| base::ProcessHandle plugin_process_handle,
|
| const IPC::ChannelHandle& channel_handle,
|
| PP_Module pp_module,
|
| - pp::proxy::Dispatcher::GetInterfaceFunc local_get_interface) {
|
| - dispatcher_.reset(new pp::proxy::HostDispatcher(
|
| + ppapi::proxy::Dispatcher::GetInterfaceFunc local_get_interface) {
|
| + dispatcher_.reset(new ppapi::proxy::HostDispatcher(
|
| plugin_process_handle, pp_module, local_get_interface));
|
|
|
| if (!dispatcher_->InitHostWithChannel(
|
| @@ -466,7 +466,7 @@ bool BrokerDispatcherWrapper::Init(
|
| base::ProcessHandle plugin_process_handle,
|
| const IPC::ChannelHandle& channel_handle) {
|
| dispatcher_.reset(
|
| - new pp::proxy::BrokerHostDispatcher(plugin_process_handle));
|
| + new ppapi::proxy::BrokerHostDispatcher(plugin_process_handle));
|
|
|
| if (!dispatcher_->InitBrokerWithChannel(PepperPluginRegistry::GetInstance(),
|
| channel_handle,
|
|
|