webkit/plugins/ppapi/plugin_module.cc - Issue 9585033: Revert 124797 - Add NetworkList/NetworkMonitor hooks and C++ wrappers.

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

Issue 9585033: Revert 124797 - Add NetworkList/NetworkMonitor hooks and C++ wrappers. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src/

Patch Set: Created 8 years, 9 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/resource_creation_api.h ('k') | webkit/plugins/ppapi/resource_creation_impl.h » ('j') | no next file with comments »

OLD	NEW
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"

(...skipping 57 matching lines...) Expand 10 before \| Expand all \| Expand 10 after Loading...
68 #include "ppapi/c/ppp_instance.h"	68 #include "ppapi/c/ppp_instance.h"

69 #include "ppapi/c/private/ppb_file_ref_private.h"	69 #include "ppapi/c/private/ppb_file_ref_private.h"

70 #include "ppapi/c/private/ppb_flash.h"	70 #include "ppapi/c/private/ppb_flash.h"

71 #include "ppapi/c/private/ppb_flash_clipboard.h"	71 #include "ppapi/c/private/ppb_flash_clipboard.h"

72 #include "ppapi/c/private/ppb_flash_file.h"	72 #include "ppapi/c/private/ppb_flash_file.h"

73 #include "ppapi/c/private/ppb_flash_fullscreen.h"	73 #include "ppapi/c/private/ppb_flash_fullscreen.h"

74 #include "ppapi/c/private/ppb_flash_message_loop.h"	74 #include "ppapi/c/private/ppb_flash_message_loop.h"

75 #include "ppapi/c/private/ppb_flash_tcp_socket.h"	75 #include "ppapi/c/private/ppb_flash_tcp_socket.h"

76 #include "ppapi/c/private/ppb_gpu_blacklist_private.h"	76 #include "ppapi/c/private/ppb_gpu_blacklist_private.h"

77 #include "ppapi/c/private/ppb_instance_private.h"	77 #include "ppapi/c/private/ppb_instance_private.h"

78 #include "ppapi/c/private/ppb_network_list_private.h"

79 #include "ppapi/c/private/ppb_network_monitor_private.h"

80 #include "ppapi/c/private/ppb_pdf.h"	78 #include "ppapi/c/private/ppb_pdf.h"

81 #include "ppapi/c/private/ppb_proxy_private.h"	79 #include "ppapi/c/private/ppb_proxy_private.h"

82 #include "ppapi/c/private/ppb_tcp_server_socket_private.h"	80 #include "ppapi/c/private/ppb_tcp_server_socket_private.h"

83 #include "ppapi/c/private/ppb_tcp_socket_private.h"	81 #include "ppapi/c/private/ppb_tcp_socket_private.h"

84 #include "ppapi/c/private/ppb_udp_socket_private.h"	82 #include "ppapi/c/private/ppb_udp_socket_private.h"

85 #include "ppapi/c/private/ppb_uma_private.h"	83 #include "ppapi/c/private/ppb_uma_private.h"

86 #include "ppapi/c/trusted/ppb_audio_input_trusted_dev.h"	84 #include "ppapi/c/trusted/ppb_audio_input_trusted_dev.h"

87 #include "ppapi/c/trusted/ppb_audio_trusted.h"	85 #include "ppapi/c/trusted/ppb_audio_trusted.h"

88 #include "ppapi/c/trusted/ppb_broker_trusted.h"	86 #include "ppapi/c/trusted/ppb_broker_trusted.h"

89 #include "ppapi/c/trusted/ppb_browser_font_trusted.h"	87 #include "ppapi/c/trusted/ppb_browser_font_trusted.h"

(...skipping 560 matching lines...) Expand 10 before \| Expand all \| Expand 10 after Loading...
650	648

651 if (retval != 0) {	649 if (retval != 0) {

652 LOG(WARNING) << "PPP_InitializeModule returned failure " << retval;	650 LOG(WARNING) << "PPP_InitializeModule returned failure " << retval;

653 return false;	651 return false;

654 }	652 }

655 return true;	653 return true;

656 }	654 }

657	655

658 } // namespace ppapi	656 } // namespace ppapi

659 } // namespace webkit	657 } // namespace webkit

OLD	NEW