OLD | NEW |
1 // Copyright (c) 2011 The Chromium Authors. All rights reserved. | 1 // Copyright (c) 2011 The Chromium Authors. All rights reserved. |
2 // Use of this source code is governed by a BSD-style license that can be | 2 // Use of this source code is governed by a BSD-style license that can be |
3 // found in the LICENSE file. | 3 // found in the LICENSE file. |
4 | 4 |
5 #include "content/common/pepper_plugin_registry.h" | 5 #include "content/common/pepper_plugin_registry.h" |
6 | 6 |
7 #include "base/command_line.h" | 7 #include "base/command_line.h" |
8 #include "base/file_util.h" | 8 #include "base/file_util.h" |
9 #include "base/native_library.h" | 9 #include "base/native_library.h" |
10 #include "base/string_split.h" | 10 #include "base/string_split.h" |
(...skipping 201 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
212 // Preload all external plugins we're not running out of process. | 212 // Preload all external plugins we're not running out of process. |
213 if (!module->InitAsLibrary(current.path)) { | 213 if (!module->InitAsLibrary(current.path)) { |
214 DLOG(ERROR) << "Failed to load pepper module: " << current.path.value(); | 214 DLOG(ERROR) << "Failed to load pepper module: " << current.path.value(); |
215 continue; | 215 continue; |
216 } | 216 } |
217 } | 217 } |
218 preloaded_modules_[current.path] = module; | 218 preloaded_modules_[current.path] = module; |
219 } | 219 } |
220 } | 220 } |
221 | 221 |
222 MessageLoop* PepperPluginRegistry::GetIPCMessageLoop() { | 222 base::MessageLoopProxy* PepperPluginRegistry::GetIPCMessageLoop() { |
223 // This is called only in the renderer so we know we have a child process. | 223 // This is called only in the renderer so we know we have a child process. |
224 DCHECK(ChildProcess::current()) << "Must be in the renderer."; | 224 DCHECK(ChildProcess::current()) << "Must be in the renderer."; |
225 return ChildProcess::current()->io_message_loop(); | 225 return ChildProcess::current()->io_message_loop_proxy(); |
226 } | 226 } |
227 | 227 |
228 base::WaitableEvent* PepperPluginRegistry::GetShutdownEvent() { | 228 base::WaitableEvent* PepperPluginRegistry::GetShutdownEvent() { |
229 DCHECK(ChildProcess::current()) << "Must be in the renderer."; | 229 DCHECK(ChildProcess::current()) << "Must be in the renderer."; |
230 return ChildProcess::current()->GetShutDownEvent(); | 230 return ChildProcess::current()->GetShutDownEvent(); |
231 } | 231 } |
232 | 232 |
233 std::set<PP_Instance>* PepperPluginRegistry::GetGloballySeenInstanceIDSet() { | 233 std::set<PP_Instance>* PepperPluginRegistry::GetGloballySeenInstanceIDSet() { |
234 // This function is not needed on the host side of the proxy. | 234 // This function is not needed on the host side of the proxy. |
235 return NULL; | 235 return NULL; |
236 } | 236 } |
OLD | NEW |