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

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

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_plugin_logger.cc ('k') | remoting/host/plugin/host_script_object.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.h
diff --git a/remoting/host/plugin/host_script_object.h b/remoting/host/plugin/host_script_object.h
index 4ffeac3d7feb0d83d7aa7f88c3bf9aa1d6f9a2d2..d623c32b110af9bef45b8a5977bd7fb20297feb3 100644
--- a/remoting/host/plugin/host_script_object.h
+++ b/remoting/host/plugin/host_script_object.h
@@ -16,6 +16,7 @@
#include "base/threading/platform_thread.h"
#include "remoting/host/chromoting_host_context.h"
#include "remoting/host/host_status_observer.h"
+#include "remoting/host/plugin/host_plugin_logger.h"
#include "third_party/npapi/bindings/npapi.h"
#include "third_party/npapi/bindings/npfunctions.h"
#include "third_party/npapi/bindings/npruntime.h"
@@ -59,6 +60,9 @@ class HostNPScriptObject : public HostStatusObserver {
bool RemoveProperty(const std::string& property_name);
bool Enumerate(std::vector<std::string>* values);
+ // Call LogDebugInfo handler if there is one.
+ void LogDebugInfo(const std::string& message);
+
// remoting::HostStatusObserver implementation.
virtual void OnSignallingConnected(remoting::SignalStrategy* signal_strategy,
const std::string& full_jid) OVERRIDE;
@@ -85,9 +89,6 @@ class HostNPScriptObject : public HostStatusObserver {
// Disconnect. No arguments or result.
bool Disconnect(const NPVariant* args, uint32_t argCount, NPVariant* result);
- // Call LogDebugInfo handler if there is one.
- void LogDebugInfo(const std::string& message);
-
// Call OnStateChanged handler if there is one.
void OnStateChanged(State state);
@@ -130,6 +131,8 @@ class HostNPScriptObject : public HostStatusObserver {
NPObject* on_state_changed_func_;
base::PlatformThreadId np_thread_id_;
+ scoped_ptr<HostPluginLogger> logger_;
+
scoped_ptr<RegisterSupportHostRequest> register_request_;
scoped_refptr<ChromotingHost> host_;
scoped_refptr<MutableHostConfig> host_config_;
« no previous file with comments | « remoting/host/plugin/host_plugin_logger.cc ('k') | remoting/host/plugin/host_script_object.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698