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

Side by Side Diff: remoting/client/plugin/pepper_entrypoints.cc

Issue 3358006: Revert 58328 - Pull new PPAPI, reland 58319 and 58321.... (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src/
Patch Set: Created 10 years, 3 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 | « chrome/test/ui/ppapi_uitest.cc ('k') | webkit/glue/plugins/pepper_plugin_instance.h » ('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) 2010 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2010 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 "remoting/client/plugin/pepper_entrypoints.h" 5 #include "remoting/client/plugin/pepper_entrypoints.h"
6 6
7 #include "base/message_loop.h" 7 #include "base/message_loop.h"
8 #include "remoting/client/plugin/chromoting_instance.h" 8 #include "remoting/client/plugin/chromoting_instance.h"
9 #include "third_party/ppapi/c/pp_errors.h" 9 #include "third_party/ppapi/c/pp_errors.h"
10 #include "third_party/ppapi/c/pp_instance.h" 10 #include "third_party/ppapi/c/pp_instance.h"
(...skipping 38 matching lines...) Expand 10 before | Expand all | Expand 10 after
49 } 49 }
50 50
51 void PPP_ShutdownModule() { 51 void PPP_ShutdownModule() {
52 delete pp::Module::Get(); 52 delete pp::Module::Get();
53 g_module_singleton = NULL; 53 g_module_singleton = NULL;
54 } 54 }
55 55
56 const void* PPP_GetInterface(const char* interface_name) { 56 const void* PPP_GetInterface(const char* interface_name) {
57 if (!pp::Module::Get()) 57 if (!pp::Module::Get())
58 return NULL; 58 return NULL;
59 return pp::Module::Get()->GetPluginInterface(interface_name); 59 return pp::Module::Get()->GetInstanceInterface(interface_name);
60 } 60 }
61 61
62 } // namespace remoting 62 } // namespace remoting
OLDNEW
« no previous file with comments | « chrome/test/ui/ppapi_uitest.cc ('k') | webkit/glue/plugins/pepper_plugin_instance.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698