webkit/plugins/ppapi/plugin_module.cc - Issue 9348069: Move the charset inteface to "trusted" (we can't implement this efficiently

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

Issue 9348069: Move the charset inteface to "trusted" (we can't implement this efficiently (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src

Patch Set: STUPID REQUIRED REVIEW COMMENT Created 8 years, 10 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_char_set_thunk.cc ('k') | no next file » | 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 65 matching lines...) Expand 10 before \| Expand all \| Expand 10 after Loading...
76 #include "ppapi/c/private/ppb_instance_private.h"	76 #include "ppapi/c/private/ppb_instance_private.h"

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

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

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

80 #include "ppapi/c/private/ppb_udp_socket_private.h"	80 #include "ppapi/c/private/ppb_udp_socket_private.h"

81 #include "ppapi/c/private/ppb_uma_private.h"	81 #include "ppapi/c/private/ppb_uma_private.h"

82 #include "ppapi/c/trusted/ppb_audio_input_trusted_dev.h"	82 #include "ppapi/c/trusted/ppb_audio_input_trusted_dev.h"

83 #include "ppapi/c/trusted/ppb_audio_trusted.h"	83 #include "ppapi/c/trusted/ppb_audio_trusted.h"

84 #include "ppapi/c/trusted/ppb_broker_trusted.h"	84 #include "ppapi/c/trusted/ppb_broker_trusted.h"

85 #include "ppapi/c/trusted/ppb_buffer_trusted.h"	85 #include "ppapi/c/trusted/ppb_buffer_trusted.h"

	86 #include "ppapi/c/trusted/ppb_char_set_trusted.h"

86 #include "ppapi/c/trusted/ppb_file_chooser_trusted.h"	87 #include "ppapi/c/trusted/ppb_file_chooser_trusted.h"

87 #include "ppapi/c/trusted/ppb_file_io_trusted.h"	88 #include "ppapi/c/trusted/ppb_file_io_trusted.h"

88 #include "ppapi/c/trusted/ppb_graphics_3d_trusted.h"	89 #include "ppapi/c/trusted/ppb_graphics_3d_trusted.h"

89 #include "ppapi/c/trusted/ppb_image_data_trusted.h"	90 #include "ppapi/c/trusted/ppb_image_data_trusted.h"

90 #include "ppapi/c/trusted/ppb_url_loader_trusted.h"	91 #include "ppapi/c/trusted/ppb_url_loader_trusted.h"

91 #include "ppapi/shared_impl/callback_tracker.h"	92 #include "ppapi/shared_impl/callback_tracker.h"

92 #include "ppapi/shared_impl/ppb_input_event_shared.h"	93 #include "ppapi/shared_impl/ppb_input_event_shared.h"

93 #include "ppapi/shared_impl/ppb_opengles2_shared.h"	94 #include "ppapi/shared_impl/ppb_opengles2_shared.h"

94 #include "ppapi/shared_impl/ppb_var_shared.h"	95 #include "ppapi/shared_impl/ppb_var_shared.h"

95 #include "ppapi/shared_impl/time_conversion.h"	96 #include "ppapi/shared_impl/time_conversion.h"

(...skipping 504 matching lines...) Expand 10 before \| Expand all \| Expand 10 after Loading...
600 int retval = entry_points.initialize_module(pp_module(), &GetInterface);	601 int retval = entry_points.initialize_module(pp_module(), &GetInterface);

601 if (retval != 0) {	602 if (retval != 0) {

602 LOG(WARNING) << "PPP_InitializeModule returned failure " << retval;	603 LOG(WARNING) << "PPP_InitializeModule returned failure " << retval;

603 return false;	604 return false;

604 }	605 }

605 return true;	606 return true;

606 }	607 }

607	608

608 } // namespace ppapi	609 } // namespace ppapi

609 } // namespace webkit	610 } // namespace webkit

OLD	NEW