diff options
| author | Torne (Richard Coles) <torne@google.com> | 2014-03-18 10:20:56 +0000 |
|---|---|---|
| committer | Torne (Richard Coles) <torne@google.com> | 2014-03-18 10:20:56 +0000 |
| commit | a1401311d1ab56c4ed0a474bd38c108f75cb0cd9 (patch) | |
| tree | 3437151d9ae1ce20a1e53a0d98c19ca01c786394 /content/common/gpu/gpu_channel.h | |
| parent | af5066f1e36c6579e74752647e6c584438f80f94 (diff) | |
| download | chromium_org-a1401311d1ab56c4ed0a474bd38c108f75cb0cd9.tar.gz | |
Merge from Chromium at DEPS revision 257591
This commit was generated by merge_to_master.py.
Change-Id: I0010df2ec3fbb5d4947cd026de2feb150ce7a6b5
Diffstat (limited to 'content/common/gpu/gpu_channel.h')
| -rw-r--r-- | content/common/gpu/gpu_channel.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/content/common/gpu/gpu_channel.h b/content/common/gpu/gpu_channel.h index b0920cf921..b79b8a0ac5 100644 --- a/content/common/gpu/gpu_channel.h +++ b/content/common/gpu/gpu_channel.h @@ -59,7 +59,7 @@ class GpuChannel : public IPC::Listener, int client_id, bool software); - bool Init(base::MessageLoopProxy* io_message_loop, + void Init(base::MessageLoopProxy* io_message_loop, base::WaitableEvent* shutdown_event); // Get the GpuChannelManager that owns this channel. |