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

Side by Side Diff: components/nacl/renderer/nexe_load_manager.h

Issue 367153004: Pepper: Remove program_url in trusted plugin. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 6 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 | components/nacl/renderer/nexe_load_manager.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 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 92 matching lines...) Expand 10 before | Expand all | Expand 10 after
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. 107 // Returns the time that the work for PNaCl translation began.
108 base::Time pnacl_start_time() const { return pnacl_start_time_; } 108 base::Time pnacl_start_time() const { return pnacl_start_time_; }
109 void set_pnacl_start_time(base::Time time) { 109 void set_pnacl_start_time(base::Time time) {
110 pnacl_start_time_ = time; 110 pnacl_start_time_ = time;
111 } 111 }
112 112
113 const std::string& program_url() const { return program_url_; }
114
113 private: 115 private:
114 DISALLOW_COPY_AND_ASSIGN(NexeLoadManager); 116 DISALLOW_COPY_AND_ASSIGN(NexeLoadManager);
115 117
116 void ReportDeadNexe(); 118 void ReportDeadNexe();
117 119
118 // Copies a crash log to the console, one line at a time. 120 // Copies a crash log to the console, one line at a time.
119 void CopyCrashLogToJsConsole(const std::string& crash_log); 121 void CopyCrashLogToJsConsole(const std::string& crash_log);
120 122
121 PP_Instance pp_instance_; 123 PP_Instance pp_instance_;
122 PP_NaClReadyState nacl_ready_state_; 124 PP_NaClReadyState nacl_ready_state_;
123 bool nexe_error_reported_; 125 bool nexe_error_reported_;
124 126
127 std::string program_url_;
128
125 // A flag indicating if the NaCl executable is being loaded from an installed 129 // A flag indicating if the NaCl executable is being loaded from an installed
126 // application. This flag is used to bucket UMA statistics more precisely to 130 // application. This flag is used to bucket UMA statistics more precisely to
127 // help determine whether nexe loading problems are caused by networking 131 // help determine whether nexe loading problems are caused by networking
128 // issues. (Installed applications will be loaded from disk.) 132 // issues. (Installed applications will be loaded from disk.)
129 // Unfortunately, the definition of what it means to be part of an installed 133 // Unfortunately, the definition of what it means to be part of an installed
130 // application is a little murky - for example an installed application can 134 // application is a little murky - for example an installed application can
131 // register a mime handler that loads NaCl executables into an arbitrary web 135 // register a mime handler that loads NaCl executables into an arbitrary web
132 // page. As such, the flag actually means "our best guess, based on the URLs 136 // page. As such, the flag actually means "our best guess, based on the URLs
133 // for NaCl resources that we have seen so far". 137 // for NaCl resources that we have seen so far".
134 bool is_installed_; 138 bool is_installed_;
(...skipping 33 matching lines...) Expand 10 before | Expand all | Expand 10 after
168 base::Time pnacl_start_time_; 172 base::Time pnacl_start_time_;
169 173
170 scoped_ptr<TrustedPluginChannel> trusted_plugin_channel_; 174 scoped_ptr<TrustedPluginChannel> trusted_plugin_channel_;
171 scoped_ptr<ManifestServiceChannel> manifest_service_channel_; 175 scoped_ptr<ManifestServiceChannel> manifest_service_channel_;
172 base::WeakPtrFactory<NexeLoadManager> weak_factory_; 176 base::WeakPtrFactory<NexeLoadManager> weak_factory_;
173 }; 177 };
174 178
175 } // namespace nacl 179 } // namespace nacl
176 180
177 #endif // COMPONENTS_NACL_RENDERER_NEXE_LOAD_MANAGER_H_ 181 #endif // COMPONENTS_NACL_RENDERER_NEXE_LOAD_MANAGER_H_
OLDNEW
« no previous file with comments | « no previous file | components/nacl/renderer/nexe_load_manager.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698