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

Side by Side Diff: remoting/host/plugin/host_script_object.h

Issue 9582031: Don't crash in ~HostNPScriptObject() when the object wasn't initialized. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: - Created 8 years, 9 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 | « remoting/host/host_mock_objects.h ('k') | remoting/host/plugin/host_script_object.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 (c) 2012 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2012 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 REMOTING_HOST_PLUGIN_HOST_SCRIPT_OBJECT_H_ 5 #ifndef REMOTING_HOST_PLUGIN_HOST_SCRIPT_OBJECT_H_
6 #define REMOTING_HOST_PLUGIN_HOST_SCRIPT_OBJECT_H_ 6 #define REMOTING_HOST_PLUGIN_HOST_SCRIPT_OBJECT_H_
7 7
8 #include <string> 8 #include <string>
9 #include <vector> 9 #include <vector>
10 10
(...skipping 176 matching lines...) Expand 10 before | Expand all | Expand 10 after
187 std::string access_code_; 187 std::string access_code_;
188 base::TimeDelta access_code_lifetime_; 188 base::TimeDelta access_code_lifetime_;
189 189
190 std::string client_username_; 190 std::string client_username_;
191 ScopedRefNPObject log_debug_info_func_; 191 ScopedRefNPObject log_debug_info_func_;
192 ScopedRefNPObject on_nat_traversal_policy_changed_func_; 192 ScopedRefNPObject on_nat_traversal_policy_changed_func_;
193 ScopedRefNPObject on_state_changed_func_; 193 ScopedRefNPObject on_state_changed_func_;
194 base::PlatformThreadId np_thread_id_; 194 base::PlatformThreadId np_thread_id_;
195 scoped_refptr<PluginMessageLoopProxy> plugin_message_loop_proxy_; 195 scoped_refptr<PluginMessageLoopProxy> plugin_message_loop_proxy_;
196 196
197 ChromotingHostContext host_context_; 197 scoped_ptr<ChromotingHostContext> host_context_;
198 HostKeyPair host_key_pair_; 198 HostKeyPair host_key_pair_;
199 scoped_ptr<SignalStrategy> signal_strategy_; 199 scoped_ptr<SignalStrategy> signal_strategy_;
200 scoped_ptr<RegisterSupportHostRequest> register_request_; 200 scoped_ptr<RegisterSupportHostRequest> register_request_;
201 scoped_ptr<LogToServer> log_to_server_; 201 scoped_ptr<LogToServer> log_to_server_;
202 scoped_ptr<DesktopEnvironment> desktop_environment_; 202 scoped_ptr<DesktopEnvironment> desktop_environment_;
203 scoped_ptr<It2MeHostUserInterface> it2me_host_user_interface_; 203 scoped_ptr<It2MeHostUserInterface> it2me_host_user_interface_;
204 204
205 scoped_refptr<ChromotingHost> host_; 205 scoped_refptr<ChromotingHost> host_;
206 int failed_login_attempts_; 206 int failed_login_attempts_;
207 207
(...skipping 22 matching lines...) Expand all
230 // On startup, it is possible to have Connect() called before the policy read 230 // On startup, it is possible to have Connect() called before the policy read
231 // is completed. Rather than just failing, we thunk the connection call so 231 // is completed. Rather than just failing, we thunk the connection call so
232 // it can be executed after at least one successful policy read. This 232 // it can be executed after at least one successful policy read. This
233 // variable contains the thunk if it is necessary. 233 // variable contains the thunk if it is necessary.
234 base::Closure pending_connect_; 234 base::Closure pending_connect_;
235 }; 235 };
236 236
237 } // namespace remoting 237 } // namespace remoting
238 238
239 #endif // REMOTING_HOST_PLUGIN_HOST_SCRIPT_OBJECT_H_ 239 #endif // REMOTING_HOST_PLUGIN_HOST_SCRIPT_OBJECT_H_
OLDNEW
« no previous file with comments | « remoting/host/host_mock_objects.h ('k') | remoting/host/plugin/host_script_object.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698