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

Issues Search
    My Issues | Starred     Open | Closed | All

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

Issue 7621070: Merge the plugin and impl side of the audio config and input event resources. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Fixed compile issues Created 9 years, 4 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
« ppapi/shared_impl/audio_config_impl.h ('K') | « webkit/glue/webkit_glue.gypi ('k') | webkit/plugins/ppapi/ppapi_plugin_instance.cc » ('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/command_line.h" 9 #include "base/command_line.h"
10 #include "base/logging.h" 10 #include "base/logging.h"
(...skipping 35 matching lines...) Expand 10 before | Expand all | Expand 10 after
46 #include "ppapi/c/pp_resource.h" 46 #include "ppapi/c/pp_resource.h"
47 #include "ppapi/c/pp_var.h" 47 #include "ppapi/c/pp_var.h"
48 #include "ppapi/c/ppb_audio.h" 48 #include "ppapi/c/ppb_audio.h"
49 #include "ppapi/c/ppb_audio_config.h" 49 #include "ppapi/c/ppb_audio_config.h"
50 #include "ppapi/c/ppb_core.h" 50 #include "ppapi/c/ppb_core.h"
51 #include "ppapi/c/ppb_file_io.h" 51 #include "ppapi/c/ppb_file_io.h"
52 #include "ppapi/c/ppb_file_ref.h" 52 #include "ppapi/c/ppb_file_ref.h"
53 #include "ppapi/c/ppb_file_system.h" 53 #include "ppapi/c/ppb_file_system.h"
54 #include "ppapi/c/ppb_graphics_2d.h" 54 #include "ppapi/c/ppb_graphics_2d.h"
55 #include "ppapi/c/ppb_image_data.h" 55 #include "ppapi/c/ppb_image_data.h"
56 #include "ppapi/c/ppb_input_event.h"
57 #include "ppapi/c/ppb_instance.h" 56 #include "ppapi/c/ppb_instance.h"
58 #include "ppapi/c/ppb_messaging.h" 57 #include "ppapi/c/ppb_messaging.h"
59 #include "ppapi/c/ppb_url_loader.h" 58 #include "ppapi/c/ppb_url_loader.h"
60 #include "ppapi/c/ppb_url_request_info.h" 59 #include "ppapi/c/ppb_url_request_info.h"
61 #include "ppapi/c/ppb_url_response_info.h" 60 #include "ppapi/c/ppb_url_response_info.h"
62 #include "ppapi/c/ppb_var.h" 61 #include "ppapi/c/ppb_var.h"
63 #include "ppapi/c/ppp.h" 62 #include "ppapi/c/ppp.h"
64 #include "ppapi/c/ppp_instance.h" 63 #include "ppapi/c/ppp_instance.h"
65 #include "ppapi/c/private/ppb_flash.h" 64 #include "ppapi/c/private/ppb_flash.h"
66 #include "ppapi/c/private/ppb_flash_clipboard.h" 65 #include "ppapi/c/private/ppb_flash_clipboard.h"
(...skipping 21 matching lines...) Expand all
88 #include "webkit/plugins/ppapi/ppb_crypto_impl.h" 87 #include "webkit/plugins/ppapi/ppb_crypto_impl.h"
89 #include "webkit/plugins/ppapi/ppb_directory_reader_impl.h" 88 #include "webkit/plugins/ppapi/ppb_directory_reader_impl.h"
90 #include "webkit/plugins/ppapi/ppb_flash_clipboard_impl.h" 89 #include "webkit/plugins/ppapi/ppb_flash_clipboard_impl.h"
91 #include "webkit/plugins/ppapi/ppb_flash_file_impl.h" 90 #include "webkit/plugins/ppapi/ppb_flash_file_impl.h"
92 #include "webkit/plugins/ppapi/ppb_flash_impl.h" 91 #include "webkit/plugins/ppapi/ppb_flash_impl.h"
93 #include "webkit/plugins/ppapi/ppb_flash_menu_impl.h" 92 #include "webkit/plugins/ppapi/ppb_flash_menu_impl.h"
94 #include "webkit/plugins/ppapi/ppb_flash_net_connector_impl.h" 93 #include "webkit/plugins/ppapi/ppb_flash_net_connector_impl.h"
95 #include "webkit/plugins/ppapi/ppb_font_impl.h" 94 #include "webkit/plugins/ppapi/ppb_font_impl.h"
96 #include "webkit/plugins/ppapi/ppb_graphics_2d_impl.h" 95 #include "webkit/plugins/ppapi/ppb_graphics_2d_impl.h"
97 #include "webkit/plugins/ppapi/ppb_image_data_impl.h" 96 #include "webkit/plugins/ppapi/ppb_image_data_impl.h"
98 #include "webkit/plugins/ppapi/ppb_input_event_impl.h"
99 #include "webkit/plugins/ppapi/ppb_layer_compositor_impl.h" 97 #include "webkit/plugins/ppapi/ppb_layer_compositor_impl.h"
100 #include "webkit/plugins/ppapi/ppb_memory_impl.h" 98 #include "webkit/plugins/ppapi/ppb_memory_impl.h"
101 #include "webkit/plugins/ppapi/ppb_opengles_impl.h" 99 #include "webkit/plugins/ppapi/ppb_opengles_impl.h"
102 #include "webkit/plugins/ppapi/ppb_proxy_impl.h" 100 #include "webkit/plugins/ppapi/ppb_proxy_impl.h"
103 #include "webkit/plugins/ppapi/ppb_scrollbar_impl.h" 101 #include "webkit/plugins/ppapi/ppb_scrollbar_impl.h"
104 #include "webkit/plugins/ppapi/ppb_uma_private_impl.h" 102 #include "webkit/plugins/ppapi/ppb_uma_private_impl.h"
105 #include "webkit/plugins/ppapi/ppb_url_util_impl.h" 103 #include "webkit/plugins/ppapi/ppb_url_util_impl.h"
106 #include "webkit/plugins/ppapi/ppb_var_impl.h" 104 #include "webkit/plugins/ppapi/ppb_var_impl.h"
107 #include "webkit/plugins/ppapi/ppb_video_capture_impl.h" 105 #include "webkit/plugins/ppapi/ppb_video_capture_impl.h"
108 #include "webkit/plugins/ppapi/ppb_video_decoder_impl.h" 106 #include "webkit/plugins/ppapi/ppb_video_decoder_impl.h"
(...skipping 482 matching lines...) Expand 10 before | Expand all | Expand 10 after
591 int retval = entry_points.initialize_module(pp_module(), &GetInterface); 589 int retval = entry_points.initialize_module(pp_module(), &GetInterface);
592 if (retval != 0) { 590 if (retval != 0) {
593 LOG(WARNING) << "PPP_InitializeModule returned failure " << retval; 591 LOG(WARNING) << "PPP_InitializeModule returned failure " << retval;
594 return false; 592 return false;
595 } 593 }
596 return true; 594 return true;
597 } 595 }
598 596
599 } // namespace ppapi 597 } // namespace ppapi
600 } // namespace webkit 598 } // namespace webkit
OLDNEW
« ppapi/shared_impl/audio_config_impl.h ('K') | « webkit/glue/webkit_glue.gypi ('k') | webkit/plugins/ppapi/ppapi_plugin_instance.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698