| Index: ppapi/proxy/host_dispatcher.h
|
| diff --git a/ppapi/proxy/host_dispatcher.h b/ppapi/proxy/host_dispatcher.h
|
| index 08d4dd6d5b4902de944c0c4c7f184cc91c3d39ed..7ede2a966b0ae9ddb72c70bb8a1d25294e00ec6b 100644
|
| --- a/ppapi/proxy/host_dispatcher.h
|
| +++ b/ppapi/proxy/host_dispatcher.h
|
| @@ -27,10 +27,9 @@ class SyncChannel;
|
| }
|
|
|
| namespace ppapi {
|
| +
|
| struct Preferences;
|
| -}
|
|
|
| -namespace pp {
|
| namespace proxy {
|
|
|
| class InterfaceProxy;
|
| @@ -52,7 +51,7 @@ class HostDispatcher : public Dispatcher {
|
| virtual bool InitHostWithChannel(Delegate* delegate,
|
| const IPC::ChannelHandle& channel_handle,
|
| bool is_client,
|
| - const ppapi::Preferences& preferences);
|
| + const Preferences& preferences);
|
|
|
| // The host side maintains a mapping from PP_Instance to Dispatcher so
|
| // that we can send the messages to the right channel.
|
| @@ -121,7 +120,7 @@ class HostDispatcher : public Dispatcher {
|
| // Function proxies created for "new-style" FunctionGroups.
|
| // TODO(brettw) this is in progress. It should be merged with the target
|
| // proxies so there is one list to consult.
|
| - scoped_ptr< ::ppapi::FunctionGroupBase >
|
| + scoped_ptr<FunctionGroupBase >
|
| function_proxies_[INTERFACE_ID_COUNT];
|
|
|
| // Guaranteed non-NULL.
|
| @@ -155,6 +154,6 @@ class ScopedModuleReference {
|
| };
|
|
|
| } // namespace proxy
|
| -} // namespace pp
|
| +} // namespace ppapi
|
|
|
| #endif // PPAPI_PROXY_HOST_DISPATCHER_H_
|
|
|