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

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

Issue 8295023: Move PPB/PPP_MouseLock out of dev/. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Sync and resolve conflicts. Created 9 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 | « ppapi/thunk/ppb_mouse_lock_thunk.cc ('k') | webkit/plugins/ppapi/ppapi_plugin_instance.h » ('j') | 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) 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 "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 10 matching lines...) Expand all
21 #include "ppapi/c/dev/ppb_crypto_dev.h" 21 #include "ppapi/c/dev/ppb_crypto_dev.h"
22 #include "ppapi/c/dev/ppb_cursor_control_dev.h" 22 #include "ppapi/c/dev/ppb_cursor_control_dev.h"
23 #include "ppapi/c/dev/ppb_directory_reader_dev.h" 23 #include "ppapi/c/dev/ppb_directory_reader_dev.h"
24 #include "ppapi/c/dev/ppb_file_chooser_dev.h" 24 #include "ppapi/c/dev/ppb_file_chooser_dev.h"
25 #include "ppapi/c/dev/ppb_find_dev.h" 25 #include "ppapi/c/dev/ppb_find_dev.h"
26 #include "ppapi/c/dev/ppb_font_dev.h" 26 #include "ppapi/c/dev/ppb_font_dev.h"
27 #include "ppapi/c/dev/ppb_fullscreen_dev.h" 27 #include "ppapi/c/dev/ppb_fullscreen_dev.h"
28 #include "ppapi/c/dev/ppb_gles_chromium_texture_mapping_dev.h" 28 #include "ppapi/c/dev/ppb_gles_chromium_texture_mapping_dev.h"
29 #include "ppapi/c/dev/ppb_layer_compositor_dev.h" 29 #include "ppapi/c/dev/ppb_layer_compositor_dev.h"
30 #include "ppapi/c/dev/ppb_memory_dev.h" 30 #include "ppapi/c/dev/ppb_memory_dev.h"
31 #include "ppapi/c/dev/ppb_mouse_lock_dev.h"
32 #include "ppapi/c/dev/ppb_query_policy_dev.h" 31 #include "ppapi/c/dev/ppb_query_policy_dev.h"
33 #include "ppapi/c/dev/ppb_scrollbar_dev.h" 32 #include "ppapi/c/dev/ppb_scrollbar_dev.h"
34 #include "ppapi/c/dev/ppb_surface_3d_dev.h" 33 #include "ppapi/c/dev/ppb_surface_3d_dev.h"
35 #include "ppapi/c/dev/ppb_testing_dev.h" 34 #include "ppapi/c/dev/ppb_testing_dev.h"
36 #include "ppapi/c/dev/ppb_text_input_dev.h" 35 #include "ppapi/c/dev/ppb_text_input_dev.h"
37 #include "ppapi/c/dev/ppb_transport_dev.h" 36 #include "ppapi/c/dev/ppb_transport_dev.h"
38 #include "ppapi/c/dev/ppb_url_util_dev.h" 37 #include "ppapi/c/dev/ppb_url_util_dev.h"
39 #include "ppapi/c/dev/ppb_var_deprecated.h" 38 #include "ppapi/c/dev/ppb_var_deprecated.h"
40 #include "ppapi/c/dev/ppb_video_capture_dev.h" 39 #include "ppapi/c/dev/ppb_video_capture_dev.h"
41 #include "ppapi/c/dev/ppb_video_decoder_dev.h" 40 #include "ppapi/c/dev/ppb_video_decoder_dev.h"
42 #include "ppapi/c/dev/ppb_video_layer_dev.h" 41 #include "ppapi/c/dev/ppb_video_layer_dev.h"
43 #include "ppapi/c/dev/ppb_widget_dev.h" 42 #include "ppapi/c/dev/ppb_widget_dev.h"
44 #include "ppapi/c/dev/ppb_zoom_dev.h" 43 #include "ppapi/c/dev/ppb_zoom_dev.h"
45 #include "ppapi/c/pp_module.h" 44 #include "ppapi/c/pp_module.h"
46 #include "ppapi/c/pp_resource.h" 45 #include "ppapi/c/pp_resource.h"
47 #include "ppapi/c/pp_var.h" 46 #include "ppapi/c/pp_var.h"
48 #include "ppapi/c/ppb_audio.h" 47 #include "ppapi/c/ppb_audio.h"
49 #include "ppapi/c/ppb_audio_config.h" 48 #include "ppapi/c/ppb_audio_config.h"
50 #include "ppapi/c/ppb_core.h" 49 #include "ppapi/c/ppb_core.h"
51 #include "ppapi/c/ppb_file_io.h" 50 #include "ppapi/c/ppb_file_io.h"
52 #include "ppapi/c/ppb_file_ref.h" 51 #include "ppapi/c/ppb_file_ref.h"
53 #include "ppapi/c/ppb_file_system.h" 52 #include "ppapi/c/ppb_file_system.h"
54 #include "ppapi/c/ppb_fullscreen.h" 53 #include "ppapi/c/ppb_fullscreen.h"
55 #include "ppapi/c/ppb_graphics_2d.h" 54 #include "ppapi/c/ppb_graphics_2d.h"
56 #include "ppapi/c/ppb_graphics_3d.h" 55 #include "ppapi/c/ppb_graphics_3d.h"
57 #include "ppapi/c/ppb_image_data.h" 56 #include "ppapi/c/ppb_image_data.h"
58 #include "ppapi/c/ppb_instance.h" 57 #include "ppapi/c/ppb_instance.h"
59 #include "ppapi/c/ppb_messaging.h" 58 #include "ppapi/c/ppb_messaging.h"
59 #include "ppapi/c/ppb_mouse_lock.h"
60 #include "ppapi/c/ppb_opengles2.h" 60 #include "ppapi/c/ppb_opengles2.h"
61 #include "ppapi/c/ppb_url_loader.h" 61 #include "ppapi/c/ppb_url_loader.h"
62 #include "ppapi/c/ppb_url_request_info.h" 62 #include "ppapi/c/ppb_url_request_info.h"
63 #include "ppapi/c/ppb_url_response_info.h" 63 #include "ppapi/c/ppb_url_response_info.h"
64 #include "ppapi/c/ppb_var.h" 64 #include "ppapi/c/ppb_var.h"
65 #include "ppapi/c/ppp.h" 65 #include "ppapi/c/ppp.h"
66 #include "ppapi/c/ppp_instance.h" 66 #include "ppapi/c/ppp_instance.h"
67 #include "ppapi/c/private/ppb_flash.h" 67 #include "ppapi/c/private/ppb_flash.h"
68 #include "ppapi/c/private/ppb_flash_clipboard.h" 68 #include "ppapi/c/private/ppb_flash_clipboard.h"
69 #include "ppapi/c/private/ppb_flash_file.h" 69 #include "ppapi/c/private/ppb_flash_file.h"
(...skipping 472 matching lines...) Expand 10 before | Expand all | Expand 10 after
542 int retval = entry_points.initialize_module(pp_module(), &GetInterface); 542 int retval = entry_points.initialize_module(pp_module(), &GetInterface);
543 if (retval != 0) { 543 if (retval != 0) {
544 LOG(WARNING) << "PPP_InitializeModule returned failure " << retval; 544 LOG(WARNING) << "PPP_InitializeModule returned failure " << retval;
545 return false; 545 return false;
546 } 546 }
547 return true; 547 return true;
548 } 548 }
549 549
550 } // namespace ppapi 550 } // namespace ppapi
551 } // namespace webkit 551 } // namespace webkit
OLDNEW
« no previous file with comments | « ppapi/thunk/ppb_mouse_lock_thunk.cc ('k') | webkit/plugins/ppapi/ppapi_plugin_instance.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698