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

Side by Side Diff: ppapi/thunk/resource_creation_api.h

Issue 7782020: Revert 99855 - Move PPAPI graphics3d and opengles interfaces out of Dev. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src/
Patch Set: Created 9 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 | « ppapi/thunk/ppb_graphics_3d_trusted_thunk.cc ('k') | ppapi/thunk/thunk.h » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Property Changes:
Added: svn:mergeinfo
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_THUNK_RESOURCE_CREATION_API_H_ 5 #ifndef PPAPI_THUNK_RESOURCE_CREATION_API_H_
6 #define PPAPI_THUNK_RESOURCE_CREATION_API_H_ 6 #define PPAPI_THUNK_RESOURCE_CREATION_API_H_
7 7
8 #include "ppapi/c/dev/ppb_file_chooser_dev.h" 8 #include "ppapi/c/dev/ppb_file_chooser_dev.h"
9 #include "ppapi/c/dev/ppb_graphics_3d_dev.h"
9 #include "ppapi/c/dev/ppb_video_layer_dev.h" 10 #include "ppapi/c/dev/ppb_video_layer_dev.h"
10 #include "ppapi/c/pp_bool.h" 11 #include "ppapi/c/pp_bool.h"
11 #include "ppapi/c/pp_instance.h" 12 #include "ppapi/c/pp_instance.h"
12 #include "ppapi/c/pp_resource.h" 13 #include "ppapi/c/pp_resource.h"
13 #include "ppapi/c/ppb_audio.h" 14 #include "ppapi/c/ppb_audio.h"
14 #include "ppapi/c/ppb_audio_config.h" 15 #include "ppapi/c/ppb_audio_config.h"
15 #include "ppapi/c/ppb_file_system.h" 16 #include "ppapi/c/ppb_file_system.h"
16 #include "ppapi/c/ppb_graphics_3d.h"
17 #include "ppapi/c/ppb_image_data.h" 17 #include "ppapi/c/ppb_image_data.h"
18 #include "ppapi/c/ppb_input_event.h" 18 #include "ppapi/c/ppb_input_event.h"
19 #include "ppapi/proxy/interface_id.h" 19 #include "ppapi/proxy/interface_id.h"
20 20
21 struct PP_Flash_Menu; 21 struct PP_Flash_Menu;
22 struct PP_FontDescription_Dev; 22 struct PP_FontDescription_Dev;
23 struct PP_VideoCaptureDeviceInfo_Dev; 23 struct PP_VideoCaptureDeviceInfo_Dev;
24 struct PP_Size; 24 struct PP_Size;
25 25
26 namespace ppapi { 26 namespace ppapi {
(...skipping 104 matching lines...) Expand 10 before | Expand all | Expand 10 after
131 PP_Bool scroll_by_page) = 0; 131 PP_Bool scroll_by_page) = 0;
132 132
133 static const proxy::InterfaceID interface_id = 133 static const proxy::InterfaceID interface_id =
134 proxy::INTERFACE_ID_RESOURCE_CREATION; 134 proxy::INTERFACE_ID_RESOURCE_CREATION;
135 }; 135 };
136 136
137 } // namespace thunk 137 } // namespace thunk
138 } // namespace ppapi 138 } // namespace ppapi
139 139
140 #endif // PPAPI_THUNK_RESOURCE_CREATION_API_H_ 140 #endif // PPAPI_THUNK_RESOURCE_CREATION_API_H_
OLDNEW
« no previous file with comments | « ppapi/thunk/ppb_graphics_3d_trusted_thunk.cc ('k') | ppapi/thunk/thunk.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698