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

Unified Diff: remoting/host/plugin/host_script_object.cc

Issue 9617027: Chromoting: Implemented security attention sequence (SAS) emulation on Windows. (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 side-by-side diff with in-line comments
Download patch
« no previous file with comments | « remoting/host/host_service_win.cc ('k') | remoting/host/remoting_me2me_host.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: remoting/host/plugin/host_script_object.cc
diff --git a/remoting/host/plugin/host_script_object.cc b/remoting/host/plugin/host_script_object.cc
index d25f89cdb5117907534863d57d482c9ac284b499..817e5a715852cb6d2fac9b3f7d75bd07ecc37dca 100644
--- a/remoting/host/plugin/host_script_object.cc
+++ b/remoting/host/plugin/host_script_object.cc
@@ -114,7 +114,8 @@ bool HostNPScriptObject::Init() {
DCHECK(plugin_message_loop_proxy_->BelongsToCurrentThread());
VLOG(2) << "Init";
- host_context_.reset(new ChromotingHostContext(plugin_message_loop_proxy_));
+ host_context_.reset(new ChromotingHostContext(NULL,
+ plugin_message_loop_proxy_));
if (!host_context_->Start()) {
host_context_.reset();
return false;
@@ -464,7 +465,7 @@ void HostNPScriptObject::FinishConnectMainThread(
// TODO(sergeyu): Fix DesktopEnvironment so that it can be created
// on either the UI or the network thread so that we can avoid
// jumping to the main thread here.
- desktop_environment_.reset(DesktopEnvironment::Create(host_context_.get()));
+ desktop_environment_ = DesktopEnvironment::Create(host_context_.get());
FinishConnectNetworkThread(uid, auth_token, auth_service);
}
« no previous file with comments | « remoting/host/host_service_win.cc ('k') | remoting/host/remoting_me2me_host.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698