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

Unified Diff: chrome/renderer/media/webrtc_logging_handler_impl.h

Issue 15741003: Moving WebRTC logging related files from content to chrome. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Fixed some errors. Created 7 years, 7 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
Index: chrome/renderer/media/webrtc_logging_handler_impl.h
diff --git a/content/renderer/media/webrtc_logging_handler_impl.h b/chrome/renderer/media/webrtc_logging_handler_impl.h
similarity index 66%
rename from content/renderer/media/webrtc_logging_handler_impl.h
rename to chrome/renderer/media/webrtc_logging_handler_impl.h
index ff9b4f30bd0557c4decd280898f7aa8d6da1f0c7..3fd2a08410fbfb759092bc43435f38d910dfa9eb 100644
--- a/content/renderer/media/webrtc_logging_handler_impl.h
+++ b/chrome/renderer/media/webrtc_logging_handler_impl.h
@@ -2,14 +2,12 @@
// Use of this source code is governed by a BSD-style license that can be
// found in the LICENSE file.
-#ifndef CONTENT_RENDERER_MEDIA_WEBRTC_LOGGING_HANDLER_IMPL_H_
-#define CONTENT_RENDERER_MEDIA_WEBRTC_LOGGING_HANDLER_IMPL_H_
+#ifndef CHROME_RENDERER_MEDIA_WEBRTC_LOGGING_HANDLER_IMPL_H_
+#define CHROME_RENDERER_MEDIA_WEBRTC_LOGGING_HANDLER_IMPL_H_
#include <string>
#include "base/shared_memory.h"
-#include "base/threading/non_thread_safe.h"
-#include "content/common/content_export.h"
#include "ipc/ipc_channel_proxy.h"
#include "third_party/libjingle/overrides/logging/log_message_delegate.h"
@@ -17,7 +15,7 @@ namespace base {
class MessageLoopProxy;
}
-namespace content {
+namespace chrome {
class PartialCircularBuffer;
class WebRtcLoggingMessageFilter;
@@ -26,16 +24,18 @@ class WebRtcLoggingMessageFilter;
// render process, owned by WebRtcLoggingMessageFilter. It communicates with
// WebRtcLoggingHandlerHost and receives logging messages from libjingle and
// writes them to a shared memory buffer.
-class CONTENT_EXPORT WebRtcLoggingHandlerImpl
- : public NON_EXPORTED_BASE(talk_base::LogMessageDelegate),
- public NON_EXPORTED_BASE(base::NonThreadSafe) {
+class WebRtcLoggingHandlerImpl
+ : public NON_EXPORTED_BASE(talk_base::LogMessageDelegate) {
public:
WebRtcLoggingHandlerImpl(
- const scoped_refptr<base::MessageLoopProxy>& io_message_loop);
+ const scoped_refptr<base::MessageLoopProxy>& io_message_loop,
+ WebRtcLoggingMessageFilter* message_filter);
virtual ~WebRtcLoggingHandlerImpl();
// talk_base::LogMessageDelegate implementation.
+ virtual void InitLogging(const std::string& app_session_id,
+ const std::string& app_url) OVERRIDE;
virtual void LogMessage(const std::string& message) OVERRIDE;
void OnFilterRemoved();
@@ -46,11 +46,14 @@ class CONTENT_EXPORT WebRtcLoggingHandlerImpl
private:
scoped_refptr<base::MessageLoopProxy> io_message_loop_;
scoped_ptr<base::SharedMemory> shared_memory_;
- scoped_ptr<content::PartialCircularBuffer> circular_buffer_;
+ scoped_ptr<chrome::PartialCircularBuffer> circular_buffer_;
+
+ WebRtcLoggingMessageFilter* message_filter_;
+ bool log_initialized_;
DISALLOW_COPY_AND_ASSIGN(WebRtcLoggingHandlerImpl);
};
-} // namespace content
+} // namespace chrome
-#endif // CONTENT_RENDERER_MEDIA_WEBRTC_LOGGING_HANDLER_IMPL_H_
+#endif // CHROME_RENDERER_MEDIA_WEBRTC_LOGGING_HANDLER_IMPL_H_

Powered by Google App Engine
This is Rietveld 408576698