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

Side by Side Diff: chrome/browser/nacl_host/nacl_process_host.h

Issue 11761025: When launching PNaCl helper nexes, explicitly disable IRT loading. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: don't forget to serialize Created 7 years, 11 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 | chrome/browser/nacl_host/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 CHROME_BROWSER_NACL_HOST_NACL_PROCESS_HOST_H_ 5 #ifndef CHROME_BROWSER_NACL_HOST_NACL_PROCESS_HOST_H_
6 #define CHROME_BROWSER_NACL_HOST_NACL_PROCESS_HOST_H_ 6 #define CHROME_BROWSER_NACL_HOST_NACL_PROCESS_HOST_H_
7 7
8 #include "build/build_config.h" 8 #include "build/build_config.h"
9 9
10 #include "base/file_path.h" 10 #include "base/file_path.h"
(...skipping 32 matching lines...) Expand 10 before | Expand all | Expand 10 after
43 class NaClProcessHost : public content::BrowserChildProcessHostDelegate { 43 class NaClProcessHost : public content::BrowserChildProcessHostDelegate {
44 public: 44 public:
45 // manifest_url: the URL of the manifest of the Native Client plugin being 45 // manifest_url: the URL of the manifest of the Native Client plugin being
46 // executed. 46 // executed.
47 // render_view_id: RenderView routing id, to control access to private APIs. 47 // render_view_id: RenderView routing id, to control access to private APIs.
48 // permission_bits: controls which interfaces the NaCl plugin can use. 48 // permission_bits: controls which interfaces the NaCl plugin can use.
49 // off_the_record: was the process launched from an incognito renderer? 49 // off_the_record: was the process launched from an incognito renderer?
50 NaClProcessHost(const GURL& manifest_url, 50 NaClProcessHost(const GURL& manifest_url,
51 int render_view_id, 51 int render_view_id,
52 uint32 permission_bits, 52 uint32 permission_bits,
53 bool uses_irt,
53 bool off_the_record); 54 bool off_the_record);
54 virtual ~NaClProcessHost(); 55 virtual ~NaClProcessHost();
55 56
56 // Do any minimal work that must be done at browser startup. 57 // Do any minimal work that must be done at browser startup.
57 static void EarlyStartup(); 58 static void EarlyStartup();
58 59
59 // Initialize the new NaCl process. Result is returned by sending ipc 60 // Initialize the new NaCl process. Result is returned by sending ipc
60 // message reply_msg. 61 // message reply_msg.
61 void Launch(ChromeRenderMessageFilter* chrome_render_message_filter, 62 void Launch(ChromeRenderMessageFilter* chrome_render_message_filter,
62 IPC::Message* reply_msg, 63 IPC::Message* reply_msg,
(...skipping 124 matching lines...) Expand 10 before | Expand all | Expand 10 after
187 // Socket pairs for the NaCl process and renderer. 188 // Socket pairs for the NaCl process and renderer.
188 scoped_ptr<NaClInternal> internal_; 189 scoped_ptr<NaClInternal> internal_;
189 190
190 base::WeakPtrFactory<NaClProcessHost> weak_factory_; 191 base::WeakPtrFactory<NaClProcessHost> weak_factory_;
191 192
192 scoped_ptr<content::BrowserChildProcessHost> process_; 193 scoped_ptr<content::BrowserChildProcessHost> process_;
193 194
194 bool enable_exception_handling_; 195 bool enable_exception_handling_;
195 bool enable_debug_stub_; 196 bool enable_debug_stub_;
196 197
198 bool uses_irt_;
199
197 bool off_the_record_; 200 bool off_the_record_;
198 201
199 bool enable_ipc_proxy_; 202 bool enable_ipc_proxy_;
200 203
201 // Channel proxy to terminate the NaCl-Browser PPAPI channel. 204 // Channel proxy to terminate the NaCl-Browser PPAPI channel.
202 scoped_ptr<IPC::ChannelProxy> ipc_proxy_channel_; 205 scoped_ptr<IPC::ChannelProxy> ipc_proxy_channel_;
203 // Plugin listener, to forward browser channel messages to us. 206 // Plugin listener, to forward browser channel messages to us.
204 PluginListener ipc_plugin_listener_; 207 PluginListener ipc_plugin_listener_;
205 // Browser host for plugin process. 208 // Browser host for plugin process.
206 scoped_ptr<content::BrowserPpapiHost> ppapi_host_; 209 scoped_ptr<content::BrowserPpapiHost> ppapi_host_;
207 210
208 int render_view_id_; 211 int render_view_id_;
209 212
210 DISALLOW_COPY_AND_ASSIGN(NaClProcessHost); 213 DISALLOW_COPY_AND_ASSIGN(NaClProcessHost);
211 }; 214 };
212 215
213 #endif // CHROME_BROWSER_NACL_HOST_NACL_PROCESS_HOST_H_ 216 #endif // CHROME_BROWSER_NACL_HOST_NACL_PROCESS_HOST_H_
OLDNEW
« no previous file with comments | « no previous file | chrome/browser/nacl_host/nacl_process_host.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698