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

Unified Diff: remoting/host/simple_host_process.cc

Issue 7262015: Conenct Chromoting plugin debug log to JS UI. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: merge Created 9 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 side-by-side diff with in-line comments
Download patch
« no previous file with comments | « remoting/host/plugin/host_script_object.cc ('k') | remoting/remoting.gyp » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: remoting/host/simple_host_process.cc
diff --git a/remoting/host/simple_host_process.cc b/remoting/host/simple_host_process.cc
index 9ecb5234b368aff64e953d0be58362bb86416590..e8c1f32eef84446385db2821b566a7b39d4012db 100644
--- a/remoting/host/simple_host_process.cc
+++ b/remoting/host/simple_host_process.cc
@@ -34,6 +34,7 @@
#include "crypto/nss_util.h"
#include "media/base/media.h"
#include "remoting/base/constants.h"
+#include "remoting/base/logger.h"
#include "remoting/base/tracer.h"
#include "remoting/host/capturer_fake.h"
#include "remoting/host/chromoting_host.h"
@@ -175,6 +176,7 @@ class SimpleHost {
// Construct a chromoting host.
scoped_refptr<ChromotingHost> host;
+ logger_.reset(new remoting::Logger());
if (fake_) {
remoting::Capturer* capturer =
new remoting::CapturerFake();
@@ -193,10 +195,10 @@ class SimpleHost {
new DesktopEnvironment(&context, capturer, event_executor, curtain,
disconnect_window, continue_window,
local_input_monitor),
- access_verifier.release());
+ access_verifier.release(), logger_.get());
} else {
host = ChromotingHost::Create(&context, config,
- access_verifier.release());
+ access_verifier.release(), logger_.get());
}
host->set_it2me(is_it2me_);
@@ -250,6 +252,8 @@ class SimpleHost {
return FilePath(home_path).Append(kDefaultConfigPath);
}
+ scoped_ptr<remoting::Logger> logger_;
+
FilePath config_path_;
bool fake_;
bool is_it2me_;
« no previous file with comments | « remoting/host/plugin/host_script_object.cc ('k') | remoting/remoting.gyp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698