Convert Chromoting plugin logging to appear in client UI

remoting/client/plugin/chromoting_instance.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.
 
 // TODO(ajwong): We need to come up with a better description of the
 // responsibilities for each thread.
 
 #ifndef REMOTING_CLIENT_PLUGIN_CHROMOTING_INSTANCE_H_
 #define REMOTING_CLIENT_PLUGIN_CHROMOTING_INSTANCE_H_
 
@@ skipping 23 matching lines @@
 
 namespace remoting {
 
 namespace protocol {
 class ConnectionToHost;
 }  // namespace protocol
 
 class ChromotingClient;
 class ChromotingStats;
 class ClientContext;
+class ClientLogger;
 class InputHandler;
 class JingleThread;
 class PepperView;
 class PepperViewProxy;
 class RectangleUpdateDecoder;
 
 struct ClientConfig;
 
 namespace protocol {
 class HostConnection;
@@ skipping 24 matching lines @@
   // Convenience wrapper to get the ChromotingScriptableObject.
   ChromotingScriptableObject* GetScriptableObject();
 
   // Called by ChromotingScriptableObject to provide username and password.
   void SubmitLoginInfo(const std::string& username,
                        const std::string& password);
 
   // Called by ChromotingScriptableObject to set scale-to-fit.
   void SetScaleToFit(bool scale_to_fit);
 
-  void LogDebugInfo(const std::string& info);
+  void Log(int severity, const char* format, ...);
+  void VLog(int verboselevel, const char* format, ...);
 
   // Return statistics record by ChromotingClient.
   // If no connection is currently active then NULL will be returned.
   ChromotingStats* GetStats();
 
  private:
   FRIEND_TEST_ALL_PREFIXES(ChromotingInstanceTest, TestCaseSetup);
 
   bool initialized_;
 
@@ skipping 12 matching lines @@
   scoped_refptr<RectangleUpdateDecoder> rectangle_decoder_;
   scoped_ptr<InputHandler> input_handler_;
   scoped_ptr<ChromotingClient> client_;
 
   // XmppProxy is a refcounted interface used to perform thread-switching and
   // detaching between objects whose lifetimes are controlled by pepper, and
   // jingle_glue objects. This is used when if we start a sandboxed jingle
   // connection.
   scoped_refptr<PepperXmppProxy> xmpp_proxy_;
 
+  ClientLogger* logger_;

[dmac, 2011/05/13 23:34:10]

does this need to be a scoped_ptr? it looks like it owns logger_... or could it
just be a PepperClientLogger here (not a ptr).

[garykac, 2011/05/14 01:09:16]

Done.

+
   // JavaScript interface to control this instance.
   // This wraps a ChromotingScriptableObject in a pp::Var.
   pp::Var instance_object_;
 
   DISALLOW_COPY_AND_ASSIGN(ChromotingInstance);
 };
 
 }  // namespace remoting
 
 #endif  // REMOTING_CLIENT_PLUGIN_CHROMOTING_INSTANCE_H_