summaryrefslogtreecommitdiffstats
path: root/chrome/browser
diff options
context:
space:
mode:
Diffstat (limited to 'chrome/browser')
-rw-r--r--chrome/browser/nacl_host/nacl_broker_service.cc7
1 files changed, 4 insertions, 3 deletions
diff --git a/chrome/browser/nacl_host/nacl_broker_service.cc b/chrome/browser/nacl_host/nacl_broker_service.cc
index 76da887..6a58c2f 100644
--- a/chrome/browser/nacl_host/nacl_broker_service.cc
+++ b/chrome/browser/nacl_host/nacl_broker_service.cc
@@ -39,11 +39,12 @@ bool NaClBrokerService::StartBroker() {
bool NaClBrokerService::LaunchLoader(NaClProcessHost* nacl_process_host,
const std::wstring& loader_channel_id) {
+ // Add task to the list
+ pending_launches_[loader_channel_id] = nacl_process_host;
if (broker_started_) {
+ // If the broker is not ready yet
+ // we will call LaunchLoader in OnBrokerStarted
broker_host_->LaunchLoader(loader_channel_id);
- } else {
- // Add task to the list
- pending_launches_[loader_channel_id] = nacl_process_host;
}
return true;
}