Change Chromoting logger to be setup in plugin's NP_Initialize.

remoting/host/plugin/host_script_object.h

 // Copyright (c) 2011 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #ifndef REMOTING_HOST_PLUGIN_HOST_SCRIPT_OBJECT_H_
 #define REMOTING_HOST_PLUGIN_HOST_SCRIPT_OBJECT_H_
 
 #include <string>
 #include <vector>
 
@@ skipping 62 matching lines @@
   virtual void OnSignallingConnected(remoting::SignalStrategy* signal_strategy,
                                      const std::string& full_jid) OVERRIDE;
   virtual void OnSignallingDisconnected() OVERRIDE;
   virtual void OnAccessDenied() OVERRIDE;
   virtual void OnClientAuthenticated(
       remoting::protocol::ConnectionToClient* client) OVERRIDE;
   virtual void OnClientDisconnected(
       remoting::protocol::ConnectionToClient* client) OVERRIDE;
   virtual void OnShutdown() OVERRIDE;
 
-  // A Log Message Handler that is called after each LOG message has been
-  // processed. This must be of type LogMessageHandlerFunction defined in
-  // base/logging.h.
-  static bool LogToUI(int severity, const char* file, int line,
-                      size_t message_start, const std::string& str);
+  // Post LogDebugInfo to the correct proxy (and thus, on the correct thread).
+  // This should only be called by HostLogHandler. To log to the UI, use the
+  // standard LOG(INFO) and it will be sent to this method.
+  void PostLogDebugInfo(const std::string& message);
 
  private:
   enum State {
     kDisconnected,
     kRequestedAccessCode,
     kReceivedAccessCode,
     kConnected,
     kAffirmingConnection,
     kError
   };
 
   // Start connection. args are:
   //   string uid, string auth_token
   // No result.
   bool Connect(const NPVariant* args, uint32_t argCount, NPVariant* result);
 
   // Disconnect. No arguments or result.
   bool Disconnect(const NPVariant* args, uint32_t argCount, NPVariant* result);
 
   // Localize strings. args are:
   //   localize_func - a callback function which returns a localized string for
   //   a given tag name.
   // No result.
   bool Localize(const NPVariant* args, uint32_t argCount, NPVariant* result);
 
   // Call OnStateChanged handler if there is one.
   void OnStateChanged(State state);
 
   // Call LogDebugInfo handler if there is one.
+  // This must be called on the correct thread.
   void LogDebugInfo(const std::string& message);
 
   // Callbacks invoked during session setup.
   void OnReceivedSupportID(remoting::SupportAccessVerifier* access_verifier,
                            bool success,
                            const std::string& support_id,
                            const base::TimeDelta& lifetime);
 
   // Helper functions that run on main thread. Can be called on any
   // other thread.
@@ skipping 46 matching lines @@
   scoped_ptr<DesktopEnvironment> desktop_environment_;
 
   scoped_refptr<ChromotingHost> host_;
   int failed_login_attempts_;
 
   UiStrings ui_strings_;
   base::Lock ui_strings_lock_;
 
   base::WaitableEvent disconnected_event_;
 
+  // True if we're in the middle of handling a log message.
+  bool currently_logging_;

[Wez, 2011/09/01 01:21:23]

nit: Should technically be am_currently_logging_?

[garykac, 2011/09/01 01:30:55]

Done.

+
   scoped_ptr<policy_hack::NatPolicy> nat_policy_;
 
   // Host the current nat traversal policy setting.
   bool nat_traversal_enabled_;
 
   // Indiciates whether or not a policy has ever been read. This is to ensure
   // that on startup, we do not accidentally start a connection before we have
   // queried our policy restrictions.
   bool policy_received_;
 
   // On startup, it is possible to have Connect() called before the policy read
   // is completed.  Rather than just failing, we thunk the connection call so
   // it can be executed after at least one successful policy read. This
   // variable contains the thunk if it is necessary.
   base::Closure pending_connect_;
 };
 
 }  // namespace remoting
 
 DISABLE_RUNNABLE_METHOD_REFCOUNT(remoting::HostNPScriptObject);
 
-#endif  // REMOTING_HOST_HOST_SCRIPT_OBJECT_H_
+#endif  // REMOTING_HOST_PLUGIN_HOST_SCRIPT_OBJECT_H_