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

Side by Side Diff: ppapi/proxy/plugin_main_nacl.cc

Issue 16667019: Rename base/hash_tables to base/containers/hash_tables. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 7 years, 6 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/proxy/plugin_dispatcher.h ('k') | ppapi/proxy/ppapi_command_buffer_proxy.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) 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 <map> 5 #include <map>
6 #include <set> 6 #include <set>
7 7
8 #include "build/build_config.h" 8 #include "build/build_config.h"
9 // Need to include this before most other files because it defines 9 // Need to include this before most other files because it defines
10 // IPC_MESSAGE_LOG_ENABLED. We need to use it to define 10 // IPC_MESSAGE_LOG_ENABLED. We need to use it to define
(...skipping 12 matching lines...) Expand all
23 #include "native_client/src/shared/srpc/nacl_srpc.h" 23 #include "native_client/src/shared/srpc/nacl_srpc.h"
24 #include "native_client/src/untrusted/irt/irt_ppapi.h" 24 #include "native_client/src/untrusted/irt/irt_ppapi.h"
25 #include "ppapi/c/ppp.h" 25 #include "ppapi/c/ppp.h"
26 #include "ppapi/c/ppp_instance.h" 26 #include "ppapi/c/ppp_instance.h"
27 #include "ppapi/proxy/plugin_dispatcher.h" 27 #include "ppapi/proxy/plugin_dispatcher.h"
28 #include "ppapi/proxy/plugin_globals.h" 28 #include "ppapi/proxy/plugin_globals.h"
29 #include "ppapi/proxy/plugin_proxy_delegate.h" 29 #include "ppapi/proxy/plugin_proxy_delegate.h"
30 #include "ppapi/shared_impl/ppb_audio_shared.h" 30 #include "ppapi/shared_impl/ppb_audio_shared.h"
31 31
32 #if defined(IPC_MESSAGE_LOG_ENABLED) 32 #if defined(IPC_MESSAGE_LOG_ENABLED)
33 #include "base/hash_tables.h" 33 #include "base/containers/hash_tables.h"
34 34
35 LogFunctionMap g_log_function_mapping; 35 LogFunctionMap g_log_function_mapping;
36 36
37 #define IPC_MESSAGE_MACROS_LOG_ENABLED 37 #define IPC_MESSAGE_MACROS_LOG_ENABLED
38 #define IPC_LOG_TABLE_ADD_ENTRY(msg_id, logger) \ 38 #define IPC_LOG_TABLE_ADD_ENTRY(msg_id, logger) \
39 g_log_function_mapping[msg_id] = logger 39 g_log_function_mapping[msg_id] = logger
40 40
41 #endif 41 #endif
42 #include "ppapi/proxy/ppapi_messages.h" 42 #include "ppapi/proxy/ppapi_messages.h"
43 43
(...skipping 247 matching lines...) Expand 10 before | Expand all | Expand 10 after
291 291
292 PpapiDispatcher ppapi_dispatcher(io_thread.message_loop_proxy()); 292 PpapiDispatcher ppapi_dispatcher(io_thread.message_loop_proxy());
293 plugin_globals.set_plugin_proxy_delegate(&ppapi_dispatcher); 293 plugin_globals.set_plugin_proxy_delegate(&ppapi_dispatcher);
294 294
295 loop.Run(); 295 loop.Run();
296 296
297 NaClSrpcModuleFini(); 297 NaClSrpcModuleFini();
298 298
299 return 0; 299 return 0;
300 } 300 }
OLDNEW
« no previous file with comments | « ppapi/proxy/plugin_dispatcher.h ('k') | ppapi/proxy/ppapi_command_buffer_proxy.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698