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

Unified Diff: components/nacl/renderer/ppb_nacl_private_impl.cc

Issue 1090233003: Set up a NaCl load status callback to start replacing "start_module". (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: use the enum instead of int Created 5 years, 8 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 side-by-side diff with in-line comments
Download patch
« no previous file with comments | « components/nacl/renderer/ppb_nacl_private.h ('k') | components/nacl/renderer/trusted_plugin_channel.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: components/nacl/renderer/ppb_nacl_private_impl.cc
diff --git a/components/nacl/renderer/ppb_nacl_private_impl.cc b/components/nacl/renderer/ppb_nacl_private_impl.cc
index 8aae9e87db61991e60485e9e8569c9518c9dbb10..2f3cd586f6cc490224ab63b751a0c1d4acd00bf5 100644
--- a/components/nacl/renderer/ppb_nacl_private_impl.cc
+++ b/components/nacl/renderer/ppb_nacl_private_impl.cc
@@ -500,13 +500,13 @@ void LaunchSelLdr(PP_Instance instance,
// Create the trusted plugin channel.
if (IsValidChannelHandle(launch_result.trusted_ipc_channel_handle)) {
- bool report_exit_status = PP_ToBool(main_service_runtime);
+ bool is_helper_nexe = !PP_ToBool(main_service_runtime);
scoped_ptr<TrustedPluginChannel> trusted_plugin_channel(
new TrustedPluginChannel(
load_manager,
launch_result.trusted_ipc_channel_handle,
content::RenderThread::Get()->GetShutdownEvent(),
- report_exit_status));
+ is_helper_nexe));
load_manager->set_trusted_plugin_channel(trusted_plugin_channel.Pass());
} else {
PostPPCompletionCallback(callback, PP_ERROR_FAILED);
@@ -1484,22 +1484,6 @@ void DownloadFile(PP_Instance instance,
file_downloader->Load(url_request);
}
-void ReportSelLdrStatus(PP_Instance instance,
- int32_t load_status,
- int32_t max_status) {
- HistogramEnumerate("NaCl.LoadStatus.SelLdr", load_status, max_status);
- NexeLoadManager* load_manager = GetNexeLoadManager(instance);
- DCHECK(load_manager);
- if (!load_manager)
- return;
-
- // Gather data to see if being installed changes load outcomes.
- const char* name = load_manager->is_installed() ?
- "NaCl.LoadStatus.SelLdr.InstalledApp" :
- "NaCl.LoadStatus.SelLdr.NotInstalledApp";
- HistogramEnumerate(name, load_status, max_status);
-}
-
void LogTranslateTime(const char* histogram_name,
int64_t time_in_us) {
ppapi::PpapiGlobals::Get()->GetMainThreadMessageLoop()->PostTask(
@@ -1717,7 +1701,6 @@ const PPB_NaCl_Private nacl_interface = {
&GetPNaClResourceInfo,
&GetCpuFeatureAttrs,
&DownloadNexe,
- &ReportSelLdrStatus,
&LogTranslateTime,
&LogBytesCompiledVsDowloaded,
&SetPNaClStartTime,
« no previous file with comments | « components/nacl/renderer/ppb_nacl_private.h ('k') | components/nacl/renderer/trusted_plugin_channel.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698