webkit/plugins/ppapi/plugin_module.cc - Issue 10984094: Hook up PpapiPermissions in more places.

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

Issue 10984094: Hook up PpapiPermissions in more places. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src

Patch Set: Created 8 years, 2 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/plugins/plugin_switches.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 81 matching lines...) Expand 10 before \| Expand all \| Expand 10 after Loading...
92 #include "ppapi/c/trusted/ppb_broker_trusted.h"	92 #include "ppapi/c/trusted/ppb_broker_trusted.h"

93 #include "ppapi/c/trusted/ppb_browser_font_trusted.h"	93 #include "ppapi/c/trusted/ppb_browser_font_trusted.h"

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

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

96 #include "ppapi/c/trusted/ppb_file_chooser_trusted.h"	96 #include "ppapi/c/trusted/ppb_file_chooser_trusted.h"

97 #include "ppapi/c/trusted/ppb_file_io_trusted.h"	97 #include "ppapi/c/trusted/ppb_file_io_trusted.h"

98 #include "ppapi/c/trusted/ppb_graphics_3d_trusted.h"	98 #include "ppapi/c/trusted/ppb_graphics_3d_trusted.h"

99 #include "ppapi/c/trusted/ppb_image_data_trusted.h"	99 #include "ppapi/c/trusted/ppb_image_data_trusted.h"

100 #include "ppapi/c/trusted/ppb_url_loader_trusted.h"	100 #include "ppapi/c/trusted/ppb_url_loader_trusted.h"

101 #include "ppapi/shared_impl/callback_tracker.h"	101 #include "ppapi/shared_impl/callback_tracker.h"

	102 #include "ppapi/shared_impl/ppapi_switches.h"

102 #include "ppapi/shared_impl/ppb_input_event_shared.h"	103 #include "ppapi/shared_impl/ppb_input_event_shared.h"

103 #include "ppapi/shared_impl/ppb_opengles2_shared.h"	104 #include "ppapi/shared_impl/ppb_opengles2_shared.h"

104 #include "ppapi/shared_impl/ppb_var_shared.h"	105 #include "ppapi/shared_impl/ppb_var_shared.h"

105 #include "ppapi/shared_impl/time_conversion.h"	106 #include "ppapi/shared_impl/time_conversion.h"

106 #include "ppapi/thunk/enter.h"	107 #include "ppapi/thunk/enter.h"

107 #include "ppapi/thunk/thunk.h"	108 #include "ppapi/thunk/thunk.h"

108 #include "webkit/plugins/plugin_switches.h"	109 #include "webkit/plugins/plugin_switches.h"

109 #include "webkit/plugins/ppapi/common.h"	110 #include "webkit/plugins/ppapi/common.h"

110 #include "webkit/plugins/ppapi/host_globals.h"	111 #include "webkit/plugins/ppapi/host_globals.h"

111 #include "webkit/plugins/ppapi/ppapi_interface_factory.h"	112 #include "webkit/plugins/ppapi/ppapi_interface_factory.h"

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

629 if (retval != 0) {	630 if (retval != 0) {

630 LOG(WARNING) << "PPP_InitializeModule returned failure " << retval;	631 LOG(WARNING) << "PPP_InitializeModule returned failure " << retval;

631 return false;	632 return false;

632 }	633 }

633 return true;	634 return true;

634 }	635 }

635	636

636 } // namespace ppapi	637 } // namespace ppapi

637 } // namespace webkit	638 } // namespace webkit

OLD	NEW