| Index: ppapi/proxy/plugin_dispatcher.cc
|
| diff --git a/ppapi/proxy/plugin_dispatcher.cc b/ppapi/proxy/plugin_dispatcher.cc
|
| index fea4de6fcb93c9226e7dc62b913755e4d5985b1e..74124629ac743fd4822fc6118e59ca2c728d8f2f 100644
|
| --- a/ppapi/proxy/plugin_dispatcher.cc
|
| +++ b/ppapi/proxy/plugin_dispatcher.cc
|
| @@ -32,9 +32,7 @@
|
| #include "ipc/ipc_channel_posix.h"
|
| #endif
|
|
|
| -using ppapi::Resource;
|
| -
|
| -namespace pp {
|
| +namespace ppapi {
|
| namespace proxy {
|
|
|
| namespace {
|
| @@ -56,8 +54,7 @@ PluginDispatcher::PluginDispatcher(base::ProcessHandle remote_process_handle,
|
| // GetInterface call or name for it, so we insert it into our table now.
|
| target_proxies_[INTERFACE_ID_PPP_CLASS].reset(new PPP_Class_Proxy(this));
|
|
|
| - ::ppapi::TrackerBase::Init(
|
| - &PluginResourceTracker::GetTrackerBaseInstance);
|
| + TrackerBase::Init(&PluginResourceTracker::GetTrackerBaseInstance);
|
| }
|
|
|
| PluginDispatcher::~PluginDispatcher() {
|
| @@ -233,13 +230,12 @@ bool PluginDispatcher::SendToBrowser(IPC::Message* msg) {
|
| return plugin_delegate_->SendToBrowser(msg);
|
| }
|
|
|
| -ppapi::WebKitForwarding* PluginDispatcher::GetWebKitForwarding() {
|
| +WebKitForwarding* PluginDispatcher::GetWebKitForwarding() {
|
| return plugin_delegate_->GetWebKitForwarding();
|
| }
|
|
|
| -::ppapi::FunctionGroupBase* PluginDispatcher::GetFunctionAPI(
|
| - pp::proxy::InterfaceID id) {
|
| - scoped_ptr< ::ppapi::FunctionGroupBase >& proxy = function_proxies_[id];
|
| +FunctionGroupBase* PluginDispatcher::GetFunctionAPI(InterfaceID id) {
|
| + scoped_ptr<FunctionGroupBase >& proxy = function_proxies_[id];
|
|
|
| if (proxy.get())
|
| return proxy.get();
|
| @@ -302,7 +298,7 @@ void PluginDispatcher::OnMsgSupportsInterface(
|
| *result = true;
|
| }
|
|
|
| -void PluginDispatcher::OnMsgSetPreferences(const ::ppapi::Preferences& prefs) {
|
| +void PluginDispatcher::OnMsgSetPreferences(const Preferences& prefs) {
|
| // The renderer may send us preferences more than once (currently this
|
| // happens every time a new plugin instance is created). Since we don't have
|
| // a way to signal to the plugin that the preferences have changed, changing
|
| @@ -317,4 +313,4 @@ void PluginDispatcher::OnMsgSetPreferences(const ::ppapi::Preferences& prefs) {
|
| }
|
|
|
| } // namespace proxy
|
| -} // namespace pp
|
| +} // namespace ppapi
|
|
|