| Index: content/browser/gpu/gpu_process_host.h
|
| diff --git a/content/browser/gpu/gpu_process_host.h b/content/browser/gpu/gpu_process_host.h
|
| index 13990d22d9b9691b97da1efa2f55ebebe1c0cdfa..41fc7fac73b91e0a6cf33f75d6c8c1123b297d8e 100644
|
| --- a/content/browser/gpu/gpu_process_host.h
|
| +++ b/content/browser/gpu/gpu_process_host.h
|
| @@ -44,11 +44,14 @@ struct GpuPreferences;
|
| struct SyncToken;
|
| }
|
|
|
| +namespace shell {
|
| +class InterfaceProvider;
|
| +}
|
| +
|
| namespace content {
|
| class BrowserChildProcessHostImpl;
|
| class GpuMainThread;
|
| class InProcessChildThreadParams;
|
| -class MojoChildConnection;
|
| class RenderWidgetHostViewFrameSubscriber;
|
| class ShaderDiskCache;
|
|
|
| @@ -107,8 +110,7 @@ class GpuProcessHost : public BrowserChildProcessHostDelegate,
|
| CONTENT_EXPORT static void RegisterGpuMainThreadFactory(
|
| GpuMainThreadFactoryFunction create);
|
|
|
| - // BrowserChildProcessHostDelegate implementation.
|
| - shell::InterfaceProvider* GetRemoteInterfaces() override;
|
| + shell::InterfaceProvider* GetRemoteInterfaces();
|
|
|
| // Get the GPU process host for the GPU process with the given ID. Returns
|
| // null if the process no longer exists.
|
| @@ -209,8 +211,7 @@ class GpuProcessHost : public BrowserChildProcessHostDelegate,
|
| const std::string& key,
|
| const std::string& shader);
|
|
|
| - bool LaunchGpuProcess(const std::string& channel_id,
|
| - gpu::GpuPreferences* gpu_preferences);
|
| + bool LaunchGpuProcess(gpu::GpuPreferences* gpu_preferences);
|
|
|
| void SendOutstandingReplies();
|
|
|
| @@ -293,11 +294,6 @@ class GpuProcessHost : public BrowserChildProcessHostDelegate,
|
|
|
| std::string shader_prefix_key_;
|
|
|
| - // Browser-side Mojo endpoint which sets up a Mojo channel with the child
|
| - // process and contains the browser's InterfaceRegistry.
|
| - const std::string child_token_;
|
| - std::unique_ptr<MojoChildConnection> mojo_child_connection_;
|
| -
|
| DISALLOW_COPY_AND_ASSIGN(GpuProcessHost);
|
| };
|
|
|
|
|