Chromium Code Reviews| OLD | NEW |
|---|---|
| 1 // Copyright 2013 The Chromium Authors. All rights reserved. | 1 // Copyright 2013 The Chromium Authors. All rights reserved. |
| 2 // Use of this source code is governed by a BSD-style license that can be | 2 // Use of this source code is governed by a BSD-style license that can be |
| 3 // found in the LICENSE file. | 3 // found in the LICENSE file. |
| 4 | 4 |
| 5 #include "chrome/browser/media/webrtc_logging_handler_host.h" | 5 #include "chrome/browser/media/webrtc_logging_handler_host.h" |
| 6 | 6 |
| 7 #include <string> | 7 #include <string> |
| 8 | 8 |
| 9 #include "base/bind.h" | 9 #include "base/bind.h" |
| 10 #include "base/command_line.h" | 10 #include "base/command_line.h" |
| (...skipping 185 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
| 196 kLogNotStoppedOrNoLogOpen); | 196 kLogNotStoppedOrNoLogOpen); |
| 197 return; | 197 return; |
| 198 } | 198 } |
| 199 g_browser_process->webrtc_log_uploader()->LoggingStoppedDontUpload(); | 199 g_browser_process->webrtc_log_uploader()->LoggingStoppedDontUpload(); |
| 200 circular_buffer_.reset(); | 200 circular_buffer_.reset(); |
| 201 log_buffer_.reset(); | 201 log_buffer_.reset(); |
| 202 logging_state_ = CLOSED; | 202 logging_state_ = CLOSED; |
| 203 FireGenericDoneCallback(&discard_callback, true, ""); | 203 FireGenericDoneCallback(&discard_callback, true, ""); |
| 204 } | 204 } |
| 205 | 205 |
| 206 void WebRtcLoggingHandlerHost::LogMessage(const std::string& message) { | |
| 207 BrowserThread::PostTask( | |
|
Henrik Grunell
2014/01/22 07:05:24
I don't think we should log if in STOPPING state,
vrk (LEFT CHROMIUM)
2014/01/23 21:46:32
Done.
| |
| 208 BrowserThread::IO, | |
| 209 FROM_HERE, | |
| 210 base::Bind(&WebRtcLoggingHandlerHost::OnAddLogMessage, this, message)); | |
| 211 } | |
| 212 | |
| 206 void WebRtcLoggingHandlerHost::OnChannelClosing() { | 213 void WebRtcLoggingHandlerHost::OnChannelClosing() { |
| 207 DCHECK(BrowserThread::CurrentlyOn(BrowserThread::IO)); | 214 DCHECK(BrowserThread::CurrentlyOn(BrowserThread::IO)); |
| 208 if (logging_state_ == STARTED || logging_state_ == STOPPED) { | 215 if (logging_state_ == STARTED || logging_state_ == STOPPED) { |
| 209 if (upload_log_on_render_close_) { | 216 if (upload_log_on_render_close_) { |
| 210 logging_state_ = STOPPED; | 217 logging_state_ = STOPPED; |
| 211 TriggerUploadLog(); | 218 TriggerUploadLog(); |
| 212 } else { | 219 } else { |
| 213 g_browser_process->webrtc_log_uploader()->LoggingStoppedDontUpload(); | 220 g_browser_process->webrtc_log_uploader()->LoggingStoppedDontUpload(); |
| 214 } | 221 } |
| 215 } | 222 } |
| (...skipping 172 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
| 388 void WebRtcLoggingHandlerHost::FireGenericDoneCallback( | 395 void WebRtcLoggingHandlerHost::FireGenericDoneCallback( |
| 389 GenericDoneCallback* callback, bool success, | 396 GenericDoneCallback* callback, bool success, |
| 390 const std::string& error_message) { | 397 const std::string& error_message) { |
| 391 DCHECK(BrowserThread::CurrentlyOn(BrowserThread::IO)); | 398 DCHECK(BrowserThread::CurrentlyOn(BrowserThread::IO)); |
| 392 DCHECK(!(*callback).is_null()); | 399 DCHECK(!(*callback).is_null()); |
| 393 content::BrowserThread::PostTask(content::BrowserThread::UI, FROM_HERE, | 400 content::BrowserThread::PostTask(content::BrowserThread::UI, FROM_HERE, |
| 394 base::Bind(*callback, success, | 401 base::Bind(*callback, success, |
| 395 error_message)); | 402 error_message)); |
| 396 (*callback).Reset(); | 403 (*callback).Reset(); |
| 397 } | 404 } |
| OLD | NEW |