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

Side by Side Diff: ppapi/shared_impl/ppp_instance_combined.h

Issue 7362012: Remove untrusted scripting support. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: merged Created 9 years, 5 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 | « ppapi/proxy/ppp_instance_proxy_test.cc ('k') | ppapi/shared_impl/ppp_instance_combined.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 #ifndef PPAPI_SHARED_IMPL_PPP_INSTANCE_COMBINED_H_ 5 #ifndef PPAPI_SHARED_IMPL_PPP_INSTANCE_COMBINED_H_
6 #define PPAPI_SHARED_IMPL_PPP_INSTANCE_COMBINED_H_ 6 #define PPAPI_SHARED_IMPL_PPP_INSTANCE_COMBINED_H_
7 7
8 #include "base/basictypes.h" 8 #include "base/basictypes.h"
9 #include "ppapi/c/ppp_instance.h" 9 #include "ppapi/c/ppp_instance.h"
10 10
11 namespace ppapi { 11 namespace ppapi {
12 12
13 struct PPP_Instance_Combined : public PPP_Instance_0_5 { 13 struct PPP_Instance_Combined : public PPP_Instance_0_5 {
14 public: 14 public:
15 explicit PPP_Instance_Combined(const PPP_Instance_0_5& instance_if); 15 explicit PPP_Instance_Combined(const PPP_Instance_0_5& instance_if);
16 explicit PPP_Instance_Combined(const PPP_Instance_0_4& instance_if);
17
18 PP_Var (*const GetInstanceObject_0_4)(PP_Instance instance);
19 16
20 DISALLOW_COPY_AND_ASSIGN(PPP_Instance_Combined); 17 DISALLOW_COPY_AND_ASSIGN(PPP_Instance_Combined);
21 }; 18 };
22 19
23 } // namespace ppapi 20 } // namespace ppapi
24 21
25 #endif // PPAPI_SHARED_IMPL_PPP_INSTANCE_COMBINED_H_ 22 #endif // PPAPI_SHARED_IMPL_PPP_INSTANCE_COMBINED_H_
26 23
OLDNEW
« no previous file with comments | « ppapi/proxy/ppp_instance_proxy_test.cc ('k') | ppapi/shared_impl/ppp_instance_combined.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698