OLD | NEW |
---|---|
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_path.h" | 10 #include "base/files/file_path.h" |
(...skipping 159 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
170 | 170 |
171 #if defined(OS_WIN) | 171 #if defined(OS_WIN) |
172 // Message handler for Windows hardware exception handling. | 172 // Message handler for Windows hardware exception handling. |
173 void OnAttachDebugExceptionHandler(const std::string& info, | 173 void OnAttachDebugExceptionHandler(const std::string& info, |
174 IPC::Message* reply_msg); | 174 IPC::Message* reply_msg); |
175 bool AttachDebugExceptionHandler(const std::string& info, | 175 bool AttachDebugExceptionHandler(const std::string& info, |
176 IPC::Message* reply_msg); | 176 IPC::Message* reply_msg); |
177 #endif | 177 #endif |
178 | 178 |
179 // Called when the PPAPI IPC channel to the browser has been created. | 179 // Called when the PPAPI IPC channel to the browser has been created. |
180 void OnPpapiBrowserChannelCreated(const IPC::ChannelHandle& channel_handle); | 180 void OnPpapiBrowserChannelCreated( |
Mark Seaborn
2014/02/03 22:59:07
Rename to OnPpapiChannelsCreated()?
Mark Seaborn
2014/02/07 22:53:43
Can you rebase this onto the refactoring that you
| |
181 const IPC::ChannelHandle& browser_channel_handle, | |
182 const IPC::ChannelHandle& renderer_channel_handle); | |
181 // Called when the PPAPI IPC channel to the renderer has been created. | 183 // Called when the PPAPI IPC channel to the renderer has been created. |
182 void OnPpapiRendererChannelCreated(const IPC::ChannelHandle& channel_handle); | 184 void OnPpapiRendererChannelCreated(const IPC::ChannelHandle& channel_handle); |
Mark Seaborn
2014/02/03 22:59:07
This method should go away, right?
| |
183 | 185 |
184 // Called by PluginListener, so messages from the untrusted side of | 186 // Called by PluginListener, so messages from the untrusted side of |
185 // the IPC proxy can be handled. | 187 // the IPC proxy can be handled. |
186 bool OnUntrustedMessageForwarded(const IPC::Message& msg); | 188 bool OnUntrustedMessageForwarded(const IPC::Message& msg); |
187 | 189 |
188 GURL manifest_url_; | 190 GURL manifest_url_; |
189 ppapi::PpapiPermissions permissions_; | 191 ppapi::PpapiPermissions permissions_; |
190 | 192 |
191 #if defined(OS_WIN) | 193 #if defined(OS_WIN) |
192 // This field becomes true when the broker successfully launched | 194 // This field becomes true when the broker successfully launched |
(...skipping 43 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
236 scoped_ptr<content::BrowserPpapiHost> ppapi_host_; | 238 scoped_ptr<content::BrowserPpapiHost> ppapi_host_; |
237 | 239 |
238 int render_view_id_; | 240 int render_view_id_; |
239 | 241 |
240 DISALLOW_COPY_AND_ASSIGN(NaClProcessHost); | 242 DISALLOW_COPY_AND_ASSIGN(NaClProcessHost); |
241 }; | 243 }; |
242 | 244 |
243 } // namespace nacl | 245 } // namespace nacl |
244 | 246 |
245 #endif // COMPONENTS_NACL_BROWSER_NACL_PROCESS_HOST_H_ | 247 #endif // COMPONENTS_NACL_BROWSER_NACL_PROCESS_HOST_H_ |
OLD | NEW |