| 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 #ifndef COMPONENTS_NACL_RENDERER_NEXE_LOAD_MANAGER_H_ | 5 #ifndef COMPONENTS_NACL_RENDERER_NEXE_LOAD_MANAGER_H_ |
| 6 #define COMPONENTS_NACL_RENDERER_NEXE_LOAD_MANAGER_H_ | 6 #define COMPONENTS_NACL_RENDERER_NEXE_LOAD_MANAGER_H_ |
| 7 | 7 |
| 8 #include <map> | 8 #include <map> |
| 9 #include <string> | 9 #include <string> |
| 10 | 10 |
| (...skipping 86 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 97 // Returns the manifest URL passed as an argument for this plugin instance. | 97 // Returns the manifest URL passed as an argument for this plugin instance. |
| 98 std::string GetManifestURLArgument() const; | 98 std::string GetManifestURLArgument() const; |
| 99 | 99 |
| 100 // Returns true if the MIME type for this plugin matches the type for PNaCl, | 100 // Returns true if the MIME type for this plugin matches the type for PNaCl, |
| 101 // false otherwise. | 101 // false otherwise. |
| 102 bool IsPNaCl() const; | 102 bool IsPNaCl() const; |
| 103 | 103 |
| 104 // Returns true if dev interfaces are enabled for this plugin. | 104 // Returns true if dev interfaces are enabled for this plugin. |
| 105 bool DevInterfacesEnabled() const; | 105 bool DevInterfacesEnabled() const; |
| 106 | 106 |
| 107 // Returns the time that the work for PNaCl translation began. |
| 108 base::Time pnacl_start_time() const { return pnacl_start_time_; } |
| 109 void set_pnacl_start_time(base::Time time) { |
| 110 pnacl_start_time_ = time; |
| 111 } |
| 112 |
| 107 private: | 113 private: |
| 108 DISALLOW_COPY_AND_ASSIGN(NexeLoadManager); | 114 DISALLOW_COPY_AND_ASSIGN(NexeLoadManager); |
| 109 | 115 |
| 110 void ReportDeadNexe(); | 116 void ReportDeadNexe(); |
| 111 | 117 |
| 112 // Copies a crash log to the console, one line at a time. | 118 // Copies a crash log to the console, one line at a time. |
| 113 void CopyCrashLogToJsConsole(const std::string& crash_log); | 119 void CopyCrashLogToJsConsole(const std::string& crash_log); |
| 114 | 120 |
| 115 PP_Instance pp_instance_; | 121 PP_Instance pp_instance_; |
| 116 PP_NaClReadyState nacl_ready_state_; | 122 PP_NaClReadyState nacl_ready_state_; |
| (...skipping 35 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 152 | 158 |
| 153 GURL manifest_base_url_; | 159 GURL manifest_base_url_; |
| 154 | 160 |
| 155 // Arguments passed to this plugin instance from the DOM. | 161 // Arguments passed to this plugin instance from the DOM. |
| 156 std::map<std::string, std::string> args_; | 162 std::map<std::string, std::string> args_; |
| 157 | 163 |
| 158 // We store mime_type_ outside of args_ explicitly because we change it to be | 164 // We store mime_type_ outside of args_ explicitly because we change it to be |
| 159 // lowercase. | 165 // lowercase. |
| 160 std::string mime_type_; | 166 std::string mime_type_; |
| 161 | 167 |
| 168 base::Time pnacl_start_time_; |
| 169 |
| 162 scoped_ptr<TrustedPluginChannel> trusted_plugin_channel_; | 170 scoped_ptr<TrustedPluginChannel> trusted_plugin_channel_; |
| 163 scoped_ptr<ManifestServiceChannel> manifest_service_channel_; | 171 scoped_ptr<ManifestServiceChannel> manifest_service_channel_; |
| 164 base::WeakPtrFactory<NexeLoadManager> weak_factory_; | 172 base::WeakPtrFactory<NexeLoadManager> weak_factory_; |
| 165 }; | 173 }; |
| 166 | 174 |
| 167 } // namespace nacl | 175 } // namespace nacl |
| 168 | 176 |
| 169 #endif // COMPONENTS_NACL_RENDERER_NEXE_LOAD_MANAGER_H_ | 177 #endif // COMPONENTS_NACL_RENDERER_NEXE_LOAD_MANAGER_H_ |
| OLD | NEW |