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

Issues Search
    My Issues | Starred     Open | Closed | All

Side by Side Diff: webkit/plugins/ppapi/plugin_module.cc

Issue 17962002: Merge 208513 "PPAPI: Move PPB_NetworkProxy out of Dev" (Closed) Base URL: svn://svn.chromium.org/chrome/branches/1547/src/
Patch Set: Created 7 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 | « webkit/common/plugins/ppapi/ppapi_utils.cc ('k') | no next file » | 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) 2012 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2012 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 "webkit/plugins/ppapi/plugin_module.h" 5 #include "webkit/plugins/ppapi/plugin_module.h"
6 6
7 #include <set> 7 #include <set>
8 8
9 #include "base/bind.h" 9 #include "base/bind.h"
10 #include "base/command_line.h" 10 #include "base/command_line.h"
11 #include "base/logging.h" 11 #include "base/logging.h"
12 #include "base/memory/scoped_ptr.h" 12 #include "base/memory/scoped_ptr.h"
13 #include "base/message_loop.h" 13 #include "base/message_loop.h"
14 #include "base/message_loop/message_loop_proxy.h" 14 #include "base/message_loop/message_loop_proxy.h"
15 #include "base/time.h" 15 #include "base/time.h"
16 #include "ppapi/c/dev/ppb_audio_input_dev.h" 16 #include "ppapi/c/dev/ppb_audio_input_dev.h"
17 #include "ppapi/c/dev/ppb_buffer_dev.h" 17 #include "ppapi/c/dev/ppb_buffer_dev.h"
18 #include "ppapi/c/dev/ppb_char_set_dev.h" 18 #include "ppapi/c/dev/ppb_char_set_dev.h"
19 #include "ppapi/c/dev/ppb_crypto_dev.h" 19 #include "ppapi/c/dev/ppb_crypto_dev.h"
20 #include "ppapi/c/dev/ppb_cursor_control_dev.h" 20 #include "ppapi/c/dev/ppb_cursor_control_dev.h"
21 #include "ppapi/c/dev/ppb_device_ref_dev.h" 21 #include "ppapi/c/dev/ppb_device_ref_dev.h"
22 #include "ppapi/c/dev/ppb_file_chooser_dev.h" 22 #include "ppapi/c/dev/ppb_file_chooser_dev.h"
23 #include "ppapi/c/dev/ppb_find_dev.h" 23 #include "ppapi/c/dev/ppb_find_dev.h"
24 #include "ppapi/c/dev/ppb_font_dev.h" 24 #include "ppapi/c/dev/ppb_font_dev.h"
25 #include "ppapi/c/dev/ppb_gles_chromium_texture_mapping_dev.h" 25 #include "ppapi/c/dev/ppb_gles_chromium_texture_mapping_dev.h"
26 #include "ppapi/c/dev/ppb_graphics_2d_dev.h" 26 #include "ppapi/c/dev/ppb_graphics_2d_dev.h"
27 #include "ppapi/c/dev/ppb_memory_dev.h" 27 #include "ppapi/c/dev/ppb_memory_dev.h"
28 #include "ppapi/c/dev/ppb_network_proxy_dev.h"
29 #include "ppapi/c/dev/ppb_opengles2ext_dev.h" 28 #include "ppapi/c/dev/ppb_opengles2ext_dev.h"
30 #include "ppapi/c/dev/ppb_printing_dev.h" 29 #include "ppapi/c/dev/ppb_printing_dev.h"
31 #include "ppapi/c/dev/ppb_resource_array_dev.h" 30 #include "ppapi/c/dev/ppb_resource_array_dev.h"
32 #include "ppapi/c/dev/ppb_scrollbar_dev.h" 31 #include "ppapi/c/dev/ppb_scrollbar_dev.h"
33 #include "ppapi/c/dev/ppb_testing_dev.h" 32 #include "ppapi/c/dev/ppb_testing_dev.h"
34 #include "ppapi/c/dev/ppb_text_input_dev.h" 33 #include "ppapi/c/dev/ppb_text_input_dev.h"
35 #include "ppapi/c/dev/ppb_trace_event_dev.h" 34 #include "ppapi/c/dev/ppb_trace_event_dev.h"
36 #include "ppapi/c/dev/ppb_truetype_font_dev.h" 35 #include "ppapi/c/dev/ppb_truetype_font_dev.h"
37 #include "ppapi/c/dev/ppb_url_util_dev.h" 36 #include "ppapi/c/dev/ppb_url_util_dev.h"
38 #include "ppapi/c/dev/ppb_var_deprecated.h" 37 #include "ppapi/c/dev/ppb_var_deprecated.h"
(...skipping 17 matching lines...) Expand all
56 #include "ppapi/c/ppb_fullscreen.h" 55 #include "ppapi/c/ppb_fullscreen.h"
57 #include "ppapi/c/ppb_graphics_2d.h" 56 #include "ppapi/c/ppb_graphics_2d.h"
58 #include "ppapi/c/ppb_graphics_3d.h" 57 #include "ppapi/c/ppb_graphics_3d.h"
59 #include "ppapi/c/ppb_host_resolver.h" 58 #include "ppapi/c/ppb_host_resolver.h"
60 #include "ppapi/c/ppb_image_data.h" 59 #include "ppapi/c/ppb_image_data.h"
61 #include "ppapi/c/ppb_instance.h" 60 #include "ppapi/c/ppb_instance.h"
62 #include "ppapi/c/ppb_messaging.h" 61 #include "ppapi/c/ppb_messaging.h"
63 #include "ppapi/c/ppb_mouse_cursor.h" 62 #include "ppapi/c/ppb_mouse_cursor.h"
64 #include "ppapi/c/ppb_mouse_lock.h" 63 #include "ppapi/c/ppb_mouse_lock.h"
65 #include "ppapi/c/ppb_net_address.h" 64 #include "ppapi/c/ppb_net_address.h"
65 #include "ppapi/c/ppb_network_proxy.h"
66 #include "ppapi/c/ppb_opengles2.h" 66 #include "ppapi/c/ppb_opengles2.h"
67 #include "ppapi/c/ppb_tcp_socket.h" 67 #include "ppapi/c/ppb_tcp_socket.h"
68 #include "ppapi/c/ppb_udp_socket.h" 68 #include "ppapi/c/ppb_udp_socket.h"
69 #include "ppapi/c/ppb_url_loader.h" 69 #include "ppapi/c/ppb_url_loader.h"
70 #include "ppapi/c/ppb_url_request_info.h" 70 #include "ppapi/c/ppb_url_request_info.h"
71 #include "ppapi/c/ppb_url_response_info.h" 71 #include "ppapi/c/ppb_url_response_info.h"
72 #include "ppapi/c/ppb_var.h" 72 #include "ppapi/c/ppb_var.h"
73 #include "ppapi/c/ppb_var_array.h" 73 #include "ppapi/c/ppb_var_array.h"
74 #include "ppapi/c/ppb_var_array_buffer.h" 74 #include "ppapi/c/ppb_var_array_buffer.h"
75 #include "ppapi/c/ppb_var_dictionary.h" 75 #include "ppapi/c/ppb_var_dictionary.h"
(...skipping 551 matching lines...) Expand 10 before | Expand all | Expand 10 after
627 int retval = entry_points.initialize_module(pp_module(), &GetInterface); 627 int retval = entry_points.initialize_module(pp_module(), &GetInterface);
628 if (retval != 0) { 628 if (retval != 0) {
629 LOG(WARNING) << "PPP_InitializeModule returned failure " << retval; 629 LOG(WARNING) << "PPP_InitializeModule returned failure " << retval;
630 return false; 630 return false;
631 } 631 }
632 return true; 632 return true;
633 } 633 }
634 634
635 } // namespace ppapi 635 } // namespace ppapi
636 } // namespace webkit 636 } // namespace webkit
OLDNEW
« no previous file with comments | « webkit/common/plugins/ppapi/ppapi_utils.cc ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698