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_
 
 #include <string>
 
 #include "base/gtest_prod_util.h"
 #include "base/memory/scoped_ptr.h"
 #include "ppapi/c/pp_instance.h"
 #include "ppapi/c/pp_rect.h"
 #include "ppapi/c/pp_resource.h"
 #include "ppapi/cpp/instance.h"
 #include "ppapi/cpp/var.h"
 #include "remoting/client/client_context.h"
 #include "remoting/client/plugin/chromoting_scriptable_object.h"
+#include "remoting/client/plugin/pepper_client_logger.h"
 #include "remoting/protocol/connection_to_host.h"
 
 class MessageLoop;
 struct PP_InputEvent;
 
 namespace base {
 class Thread;
 }  // namespace base
 
 namespace pp {
@@ skipping 46 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, ...);

[Sergey Ulanov, 2011/05/18 23:56:26]

Do we need this methods? Maybe it's better to add logger() that would return
pointer to |logger_|?

[garykac, 2011/05/19 21:14:36]

I originally had that, but found that:

   instance_->getLogger()->Log(...)

was a lot more irritating to deal with than simply:

   instance_->Log(...)

We type these log lines fairly frequently in the code so the convenience was
nice.

+  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_;
 
+  PepperClientLogger logger_;
+
   // 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_