Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(302)

Side by Side Diff: content/common/pepper_plugin_registry.cc

Issue 6901146: Switch IPC::ChannelProxy to use MessageLoopProxy instead of MessageLoop. This allows us to remov... (Closed) Base URL: svn://chrome-svn/chrome/trunk/src/
Patch Set: '' Created 9 years, 7 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch | Annotate | Revision Log
« no previous file with comments | « content/common/pepper_plugin_registry.h ('k') | content/gpu/gpu_child_thread.cc » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
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
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 }
OLDNEW
« no previous file with comments | « content/common/pepper_plugin_registry.h ('k') | content/gpu/gpu_child_thread.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698