| OLD | NEW | 
|---|
| 1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. | 1 // Copyright (c) 2012 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 "third_party/libjingle/overrides/talk/base/logging.h" | 5 #include "third_party/libjingle/overrides/talk/base/logging.h" | 
| 6 | 6 | 
| 7 #if defined(OS_MACOSX) && !defined(OS_IOS) | 7 #if defined(OS_MACOSX) && !defined(OS_IOS) | 
| 8 #include <CoreServices/CoreServices.h> | 8 #include <CoreServices/CoreServices.h> | 
| 9 #endif  // OS_MACOSX | 9 #endif  // OS_MACOSX | 
| 10 | 10 | 
| 11 #include <iomanip> | 11 #include <iomanip> | 
| 12 | 12 | 
| 13 #include "base/atomicops.h" | 13 #include "base/atomicops.h" | 
| 14 #include "base/string_util.h" | 14 #include "base/strings/string_util.h" | 
| 15 #include "base/threading/platform_thread.h" | 15 #include "base/threading/platform_thread.h" | 
| 16 #include "third_party/libjingle/source/talk/base/stream.h" | 16 #include "third_party/libjingle/source/talk/base/stream.h" | 
| 17 #include "third_party/libjingle/source/talk/base/stringencode.h" | 17 #include "third_party/libjingle/source/talk/base/stringencode.h" | 
| 18 #include "third_party/libjingle/source/talk/base/stringutils.h" | 18 #include "third_party/libjingle/source/talk/base/stringutils.h" | 
| 19 | 19 | 
| 20 // From this file we can't use VLOG since it expands into usage of the __FILE__ | 20 // From this file we can't use VLOG since it expands into usage of the __FILE__ | 
| 21 // macro (for correct filtering). The actual logging call from LOG_E is in | 21 // macro (for correct filtering). The actual logging call from LOG_E is in | 
| 22 // ~LogEHelper, and from DIAGNOSTIC_LOG in ~DiagnosticLogMessage. Note that the | 22 // ~LogEHelper, and from DIAGNOSTIC_LOG in ~DiagnosticLogMessage. Note that the | 
| 23 // second parameter to the LAZY_STREAM macro is true since the filter check has | 23 // second parameter to the LAZY_STREAM macro is true since the filter check has | 
| 24 // already been done for LOG_E and DIAGNOSTIC_LOG. | 24 // already been done for LOG_E and DIAGNOSTIC_LOG. | 
| (...skipping 255 matching lines...) Expand 10 before | Expand all | Expand 10 after  Loading... | 
| 280       static_cast<base::subtle::Atomic32>(base::PlatformThread::CurrentId())); | 280       static_cast<base::subtle::Atomic32>(base::PlatformThread::CurrentId())); | 
| 281   DCHECK_EQ(g_init_logging_delegate_thread_id, | 281   DCHECK_EQ(g_init_logging_delegate_thread_id, | 
| 282             base::PlatformThread::CurrentId()); | 282             base::PlatformThread::CurrentId()); | 
| 283 #endif | 283 #endif | 
| 284   CHECK(!g_logging_delegate_function); | 284   CHECK(!g_logging_delegate_function); | 
| 285   CHECK(delegate); | 285   CHECK(delegate); | 
| 286   g_logging_delegate_function = delegate; | 286   g_logging_delegate_function = delegate; | 
| 287 } | 287 } | 
| 288 | 288 | 
| 289 }  // namespace talk_base | 289 }  // namespace talk_base | 
| OLD | NEW | 
|---|