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

Side by Side Diff: components/nacl/browser/nacl_process_host.h

Issue 469423002: NaCl: Send fatal log messages via shared memory. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Remove commented out line Created 6 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
« no previous file with comments | « no previous file | components/nacl/browser/nacl_process_host.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) 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 #ifndef COMPONENTS_NACL_BROWSER_NACL_PROCESS_HOST_H_ 5 #ifndef COMPONENTS_NACL_BROWSER_NACL_PROCESS_HOST_H_
6 #define COMPONENTS_NACL_BROWSER_NACL_PROCESS_HOST_H_ 6 #define COMPONENTS_NACL_BROWSER_NACL_PROCESS_HOST_H_
7 7
8 #include "build/build_config.h" 8 #include "build/build_config.h"
9 9
10 #include "base/files/file.h" 10 #include "base/files/file.h"
11 #include "base/files/file_path.h" 11 #include "base/files/file_path.h"
12 #include "base/files/file_util_proxy.h" 12 #include "base/files/file_util_proxy.h"
13 #include "base/memory/ref_counted.h" 13 #include "base/memory/ref_counted.h"
14 #include "base/memory/shared_memory.h"
14 #include "base/memory/weak_ptr.h" 15 #include "base/memory/weak_ptr.h"
15 #include "base/message_loop/message_loop.h" 16 #include "base/message_loop/message_loop.h"
16 #include "base/process/process.h" 17 #include "base/process/process.h"
17 #include "components/nacl/common/nacl_types.h" 18 #include "components/nacl/common/nacl_types.h"
18 #include "content/public/browser/browser_child_process_host_delegate.h" 19 #include "content/public/browser/browser_child_process_host_delegate.h"
19 #include "content/public/browser/browser_child_process_host_iterator.h" 20 #include "content/public/browser/browser_child_process_host_iterator.h"
20 #include "ipc/ipc_channel_handle.h" 21 #include "ipc/ipc_channel_handle.h"
21 #include "native_client/src/public/nacl_file_info.h" 22 #include "native_client/src/public/nacl_file_info.h"
22 #include "net/socket/socket_descriptor.h" 23 #include "net/socket/socket_descriptor.h"
23 #include "ppapi/shared_impl/ppapi_permissions.h" 24 #include "ppapi/shared_impl/ppapi_permissions.h"
(...skipping 217 matching lines...) Expand 10 before | Expand all | Expand 10 after
241 // Channel proxy to terminate the NaCl-Browser PPAPI channel. 242 // Channel proxy to terminate the NaCl-Browser PPAPI channel.
242 scoped_ptr<IPC::ChannelProxy> ipc_proxy_channel_; 243 scoped_ptr<IPC::ChannelProxy> ipc_proxy_channel_;
243 // Browser host for plugin process. 244 // Browser host for plugin process.
244 scoped_ptr<content::BrowserPpapiHost> ppapi_host_; 245 scoped_ptr<content::BrowserPpapiHost> ppapi_host_;
245 246
246 int render_view_id_; 247 int render_view_id_;
247 248
248 // Throttling time in milliseconds for PpapiHostMsg_Keepalive IPCs. 249 // Throttling time in milliseconds for PpapiHostMsg_Keepalive IPCs.
249 static unsigned keepalive_throttle_interval_milliseconds_; 250 static unsigned keepalive_throttle_interval_milliseconds_;
250 251
252 // Shared memory provided to the plugin and renderer for
253 // reporting crash information.
254 base::SharedMemory crash_info_shmem_;
255
251 DISALLOW_COPY_AND_ASSIGN(NaClProcessHost); 256 DISALLOW_COPY_AND_ASSIGN(NaClProcessHost);
252 }; 257 };
253 258
254 } // namespace nacl 259 } // namespace nacl
255 260
256 #endif // COMPONENTS_NACL_BROWSER_NACL_PROCESS_HOST_H_ 261 #endif // COMPONENTS_NACL_BROWSER_NACL_PROCESS_HOST_H_
OLDNEW
« no previous file with comments | « no previous file | components/nacl/browser/nacl_process_host.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698