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

Side by Side Diff: ppapi/proxy/dispatcher.cc

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/ppapi_cpp.gypi ('k') | ppapi/proxy/interface_id.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 #include "ppapi/proxy/dispatcher.h" 5 #include "ppapi/proxy/dispatcher.h"
6 6
7 #include <string.h> // For memset. 7 #include <string.h> // For memset.
8 8
9 #include <map> 9 #include <map>
10 10
11 #include "base/compiler_specific.h" 11 #include "base/compiler_specific.h"
12 #include "base/logging.h" 12 #include "base/logging.h"
13 #include "base/memory/singleton.h" 13 #include "base/memory/singleton.h"
14 #include "ppapi/c/dev/ppb_buffer_dev.h" 14 #include "ppapi/c/dev/ppb_buffer_dev.h"
15 #include "ppapi/c/dev/ppb_char_set_dev.h" 15 #include "ppapi/c/dev/ppb_char_set_dev.h"
16 #include "ppapi/c/dev/ppb_context_3d_dev.h" 16 #include "ppapi/c/dev/ppb_context_3d_dev.h"
17 #include "ppapi/c/dev/ppb_crypto_dev.h" 17 #include "ppapi/c/dev/ppb_crypto_dev.h"
18 #include "ppapi/c/dev/ppb_cursor_control_dev.h" 18 #include "ppapi/c/dev/ppb_cursor_control_dev.h"
19 #include "ppapi/c/dev/ppb_gles_chromium_texture_mapping_dev.h" 19 #include "ppapi/c/dev/ppb_gles_chromium_texture_mapping_dev.h"
20 #include "ppapi/c/dev/ppb_font_dev.h" 20 #include "ppapi/c/dev/ppb_font_dev.h"
21 #include "ppapi/c/dev/ppb_opengles_dev.h"
21 #include "ppapi/c/dev/ppb_surface_3d_dev.h" 22 #include "ppapi/c/dev/ppb_surface_3d_dev.h"
22 #include "ppapi/c/dev/ppb_testing_dev.h" 23 #include "ppapi/c/dev/ppb_testing_dev.h"
23 #include "ppapi/c/dev/ppb_url_util_dev.h" 24 #include "ppapi/c/dev/ppb_url_util_dev.h"
24 #include "ppapi/c/dev/ppb_var_deprecated.h" 25 #include "ppapi/c/dev/ppb_var_deprecated.h"
25 #include "ppapi/c/pp_errors.h" 26 #include "ppapi/c/pp_errors.h"
26 #include "ppapi/c/ppb_audio.h" 27 #include "ppapi/c/ppb_audio.h"
27 #include "ppapi/c/ppb_audio_config.h" 28 #include "ppapi/c/ppb_audio_config.h"
28 #include "ppapi/c/ppb_core.h" 29 #include "ppapi/c/ppb_core.h"
29 #include "ppapi/c/ppb_graphics_2d.h" 30 #include "ppapi/c/ppb_graphics_2d.h"
30 #include "ppapi/c/ppb_image_data.h" 31 #include "ppapi/c/ppb_image_data.h"
31 #include "ppapi/c/ppb_instance.h" 32 #include "ppapi/c/ppb_instance.h"
32 #include "ppapi/c/ppb_opengles.h"
33 #include "ppapi/c/ppb_url_loader.h" 33 #include "ppapi/c/ppb_url_loader.h"
34 #include "ppapi/c/ppb_url_request_info.h" 34 #include "ppapi/c/ppb_url_request_info.h"
35 #include "ppapi/c/ppb_url_response_info.h" 35 #include "ppapi/c/ppb_url_response_info.h"
36 #include "ppapi/c/ppb_var.h" 36 #include "ppapi/c/ppb_var.h"
37 #include "ppapi/c/ppp_instance.h" 37 #include "ppapi/c/ppp_instance.h"
38 #include "ppapi/c/private/ppb_flash.h" 38 #include "ppapi/c/private/ppb_flash.h"
39 #include "ppapi/c/private/ppb_flash_clipboard.h" 39 #include "ppapi/c/private/ppb_flash_clipboard.h"
40 #include "ppapi/c/private/ppb_flash_file.h" 40 #include "ppapi/c/private/ppb_flash_file.h"
41 #include "ppapi/c/private/ppb_flash_menu.h" 41 #include "ppapi/c/private/ppb_flash_menu.h"
42 #include "ppapi/c/private/ppb_flash_net_connector.h" 42 #include "ppapi/c/private/ppb_flash_net_connector.h"
(...skipping 236 matching lines...) Expand 10 before | Expand all | Expand 10 after
279 return delegate()->GetIPCMessageLoop(); 279 return delegate()->GetIPCMessageLoop();
280 } 280 }
281 281
282 void Dispatcher::AddIOThreadMessageFilter( 282 void Dispatcher::AddIOThreadMessageFilter(
283 IPC::ChannelProxy::MessageFilter* filter) { 283 IPC::ChannelProxy::MessageFilter* filter) {
284 channel()->AddFilter(filter); 284 channel()->AddFilter(filter);
285 } 285 }
286 286
287 } // namespace proxy 287 } // namespace proxy
288 } // namespace ppapi 288 } // namespace ppapi
OLDNEW
« no previous file with comments | « ppapi/ppapi_cpp.gypi ('k') | ppapi/proxy/interface_id.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698