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

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

Issue 18045007: Show more different NaCl loading errors. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src/
Patch Set: rebase Created 7 years, 5 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/files/file_path.h" 10 #include "base/files/file_path.h"
(...skipping 105 matching lines...) Expand 10 before | Expand all | Expand 10 after
116 116
117 void OnResourcesReady(); 117 void OnResourcesReady();
118 118
119 // Enable the PPAPI proxy only for NaCl processes corresponding to a renderer. 119 // Enable the PPAPI proxy only for NaCl processes corresponding to a renderer.
120 bool enable_ppapi_proxy() { return render_view_id_ != 0; } 120 bool enable_ppapi_proxy() { return render_view_id_ != 0; }
121 121
122 // Sends the reply message to the renderer who is waiting for the plugin 122 // Sends the reply message to the renderer who is waiting for the plugin
123 // to load. Returns true on success. 123 // to load. Returns true on success.
124 bool ReplyToRenderer(const IPC::ChannelHandle& channel_handle); 124 bool ReplyToRenderer(const IPC::ChannelHandle& channel_handle);
125 125
126 // Sends the reply with error message to the renderer.
127 void SendErrorToRenderer(const std::string& error_message);
128
129 // Sends the reply message to the renderer. Either result or
130 // error message must be empty.
131 void SendMessageToRenderer(const nacl::NaClLaunchResult& result,
132 const std::string& error_message);
133
126 // Sends the message to the NaCl process to load the plugin. Returns true 134 // Sends the message to the NaCl process to load the plugin. Returns true
127 // on success. 135 // on success.
128 bool StartNaClExecution(); 136 bool StartNaClExecution();
129 137
130 // Called once all initialization is complete and the NaCl process is 138 // Called once all initialization is complete and the NaCl process is
131 // ready to go. Returns true on success. 139 // ready to go. Returns true on success.
132 bool SendStart(); 140 bool SendStart();
133 141
134 // Does post-process-launching tasks for starting the NaCl process once 142 // Does post-process-launching tasks for starting the NaCl process once
135 // we have a connection. 143 // we have a connection.
(...skipping 71 matching lines...) Expand 10 before | Expand all | Expand 10 after
207 PluginListener ipc_plugin_listener_; 215 PluginListener ipc_plugin_listener_;
208 // Browser host for plugin process. 216 // Browser host for plugin process.
209 scoped_ptr<content::BrowserPpapiHost> ppapi_host_; 217 scoped_ptr<content::BrowserPpapiHost> ppapi_host_;
210 218
211 int render_view_id_; 219 int render_view_id_;
212 220
213 DISALLOW_COPY_AND_ASSIGN(NaClProcessHost); 221 DISALLOW_COPY_AND_ASSIGN(NaClProcessHost);
214 }; 222 };
215 223
216 #endif // CHROME_BROWSER_NACL_HOST_NACL_PROCESS_HOST_H_ 224 #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