Allow multiple logging::LogMessage{Handler,Listener}s

remoting/client/plugin/chromoting_instance.h

 // Copyright (c) 2012 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_CLIENT_PLUGIN_CHROMOTING_INSTANCE_H_
 #define REMOTING_CLIENT_PLUGIN_CHROMOTING_INSTANCE_H_
 
 #include <stddef.h>
 #include <stdint.h>
 
@@ skipping 46 matching lines @@
 class DesktopSize;
 class DesktopVector;
 }  // namespace webrtc
 
 namespace remoting {
 
 class PepperAudioPlayer;
 class ChromotingClient;
 class ClientContext;
 class DelegatingSignalStrategy;
+class LogToUI;
 class PepperAudioPlayer;
 class PepperMouseLocker;
 
 class ChromotingInstance : public ClientUserInterface,
                            public PepperVideoRenderer::EventHandler,
                            public protocol::ClipboardStub,
                            public protocol::CursorShapeStub,
                            public pp::Instance {
  public:
   // Plugin API version. This should be incremented whenever the API
@@ skipping 52 matching lines @@
 
   // protocol::CursorShapeStub interface.
   void SetCursorShape(const protocol::CursorShapeInfo& cursor_shape) override;
 
   // PepperVideoRenderer::EventHandler interface.
   void OnVideoDecodeError() override;
   void OnVideoFirstFrameReceived() override;
   void OnVideoFrameDirtyRegion(
       const webrtc::DesktopRegion& dirty_region) override;
 
-  // Registers a global log message handler that redirects the log output to
+  // Registers a global log message listener that redirects the log output to
   // our plugin instance.
   // This is called by the plugin's PPP_InitializeModule.
   // Note that no logging will be processed unless a ChromotingInstance has been
   // registered for logging (see RegisterLoggingInstance).
-  static void RegisterLogMessageHandler();
+  static void RegisterLogMessageListener();
 
   // Registers this instance so it processes messages sent by the global log
   // message handler. This overwrites any previously registered instance.
   void RegisterLoggingInstance();
 
   // Unregisters this instance so that debug log messages will no longer be sent
   // to it. If this instance is not the currently registered logging instance,
   // then the currently registered instance will stay in effect.
   void UnregisterLoggingInstance();
 
-  // 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);
-
   // Requests the webapp to fetch a third-party token.
   void FetchThirdPartyToken(
       const std::string& host_public_key,
       const std::string& token_url,
       const std::string& scope,
       const protocol::ThirdPartyTokenFetchedCallback& token_fetched_callback);
 
   // Updates the specified UMA enumeration histogram with the input value.
   void UpdateUmaEnumHistogram(const std::string& histogram_name,
                               int64_t value,
@@ skipping 115 matching lines @@
 
   base::RepeatingTimer stats_update_timer_;
 
   base::TimeTicks connection_started_time;
   base::TimeTicks connection_authenticated_time_;
   base::TimeTicks connection_connected_time_;
 
   // Weak reference to this instance, used for global logging and task posting.
   base::WeakPtrFactory<ChromotingInstance> weak_factory_;
 
+  std::unique_ptr<LogToUI> log_to_ui_;
+
   DISALLOW_COPY_AND_ASSIGN(ChromotingInstance);
 };
 
 }  // namespace remoting
 
 #endif  // REMOTING_CLIENT_PLUGIN_CHROMOTING_INSTANCE_H_