OLD | NEW |
1 // Copyright 2014 The Chromium Authors. All rights reserved. | 1 // Copyright 2014 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 #include "components/nacl/renderer/nexe_load_manager.h" | 5 #include "components/nacl/renderer/nexe_load_manager.h" |
6 | 6 |
7 #include "base/command_line.h" | 7 #include "base/command_line.h" |
8 #include "base/logging.h" | 8 #include "base/logging.h" |
9 #include "base/metrics/histogram.h" | 9 #include "base/metrics/histogram.h" |
10 #include "components/nacl/common/nacl_host_messages.h" | 10 #include "components/nacl/common/nacl_host_messages.h" |
(...skipping 98 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
109 | 109 |
110 } // namespace | 110 } // namespace |
111 | 111 |
112 namespace nacl { | 112 namespace nacl { |
113 | 113 |
114 NexeLoadManager::NexeLoadManager( | 114 NexeLoadManager::NexeLoadManager( |
115 PP_Instance pp_instance) | 115 PP_Instance pp_instance) |
116 : pp_instance_(pp_instance), | 116 : pp_instance_(pp_instance), |
117 nacl_ready_state_(PP_NACL_READY_STATE_UNSENT), | 117 nacl_ready_state_(PP_NACL_READY_STATE_UNSENT), |
118 nexe_error_reported_(false), | 118 nexe_error_reported_(false), |
| 119 is_installed_(false), |
| 120 exit_status_(-1), |
119 plugin_instance_(content::PepperPluginInstance::Get(pp_instance)), | 121 plugin_instance_(content::PepperPluginInstance::Get(pp_instance)), |
120 weak_factory_(this) { | 122 weak_factory_(this) { |
121 SetLastError(""); | 123 SetLastError(""); |
122 } | 124 } |
123 | 125 |
124 NexeLoadManager::~NexeLoadManager() { | 126 NexeLoadManager::~NexeLoadManager() { |
125 } | 127 } |
126 | 128 |
127 void NexeLoadManager::ReportLoadSuccess(const std::string& url, | 129 void NexeLoadManager::ReportLoadSuccess(const std::string& url, |
128 uint64_t loaded_bytes, | 130 uint64_t loaded_bytes, |
(...skipping 185 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
314 void NexeLoadManager::SetReadOnlyProperty(PP_Var key, PP_Var value) { | 316 void NexeLoadManager::SetReadOnlyProperty(PP_Var key, PP_Var value) { |
315 plugin_instance_->SetEmbedProperty(key, value); | 317 plugin_instance_->SetEmbedProperty(key, value); |
316 } | 318 } |
317 | 319 |
318 void NexeLoadManager::LogToConsole(const std::string& message) { | 320 void NexeLoadManager::LogToConsole(const std::string& message) { |
319 ppapi::PpapiGlobals::Get()->LogWithSource( | 321 ppapi::PpapiGlobals::Get()->LogWithSource( |
320 pp_instance_, PP_LOGLEVEL_LOG, std::string("NativeClient"), message); | 322 pp_instance_, PP_LOGLEVEL_LOG, std::string("NativeClient"), message); |
321 } | 323 } |
322 | 324 |
323 } // namespace nacl | 325 } // namespace nacl |
OLD | NEW |