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

Unified Diff: webrtc/sdk/android/src/jni/pc/logging_jni.cc

Issue 3009613002: Android: Replace webrtc_jni namespace with nested jni namespace (Closed)
Patch Set: Rebase Created 3 years, 4 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
« no previous file with comments | « webrtc/sdk/android/src/jni/pc/java_native_conversion.cc ('k') | webrtc/sdk/android/src/jni/pc/media_jni.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: webrtc/sdk/android/src/jni/pc/logging_jni.cc
diff --git a/webrtc/sdk/android/src/jni/pc/logging_jni.cc b/webrtc/sdk/android/src/jni/pc/logging_jni.cc
index 020eeedeb62a088d5f09cb820059d8c8df1dee21..e71670a10c1e6343885f6121d687e3a51f3783f4 100644
--- a/webrtc/sdk/android/src/jni/pc/logging_jni.cc
+++ b/webrtc/sdk/android/src/jni/pc/logging_jni.cc
@@ -15,7 +15,8 @@
#include "webrtc/system_wrappers/include/logcat_trace_context.h"
#include "webrtc/system_wrappers/include/trace.h"
-namespace webrtc_jni {
+namespace webrtc {
+namespace jni {
JNI_FUNCTION_DECLARATION(void,
Logging_nativeEnableTracing,
@@ -24,16 +25,15 @@ JNI_FUNCTION_DECLARATION(void,
jstring j_path,
jint nativeLevels) {
std::string path = JavaToStdString(jni, j_path);
- if (nativeLevels != webrtc::kTraceNone) {
- webrtc::Trace::set_level_filter(nativeLevels);
+ if (nativeLevels != kTraceNone) {
+ Trace::set_level_filter(nativeLevels);
if (path != "logcat:") {
- RTC_CHECK_EQ(0, webrtc::Trace::SetTraceFile(path.c_str(), false))
+ RTC_CHECK_EQ(0, Trace::SetTraceFile(path.c_str(), false))
<< "SetTraceFile failed";
} else {
// Intentionally leak this to avoid needing to reason about its lifecycle.
// It keeps no state and functions only as a dispatch point.
- static webrtc::LogcatTraceContext* g_trace_callback =
- new webrtc::LogcatTraceContext();
+ static LogcatTraceContext* g_trace_callback = new LogcatTraceContext();
}
}
}
@@ -75,4 +75,5 @@ JNI_FUNCTION_DECLARATION(void,
LOG_TAG(static_cast<rtc::LoggingSeverity>(j_severity), tag) << message;
}
-} // namespace webrtc_jni
+} // namespace jni
+} // namespace webrtc
« no previous file with comments | « webrtc/sdk/android/src/jni/pc/java_native_conversion.cc ('k') | webrtc/sdk/android/src/jni/pc/media_jni.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698