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

Side by Side Diff: webrtc/voice_engine/include/voe_base.h

Issue 2800353002: Removing unnecessary parameters from initializeAndroidGlobals. (Closed)
Patch Set: Change type of "context" to an actual Android context. Created 3 years, 8 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 unified diff | Download patch
OLDNEW
1 /* 1 /*
2 * Copyright (c) 2012 The WebRTC project authors. All Rights Reserved. 2 * Copyright (c) 2012 The WebRTC project authors. All Rights Reserved.
3 * 3 *
4 * Use of this source code is governed by a BSD-style license 4 * Use of this source code is governed by a BSD-style license
5 * that can be found in the LICENSE file in the root of the source 5 * that can be found in the LICENSE file in the root of the source
6 * tree. An additional intellectual property rights grant can be found 6 * tree. An additional intellectual property rights grant can be found
7 * in the file PATENTS. All contributing project authors may 7 * in the file PATENTS. All contributing project authors may
8 * be found in the AUTHORS file in the root of the source tree. 8 * be found in the AUTHORS file in the root of the source tree.
9 */ 9 */
10 10
(...skipping 67 matching lines...) Expand 10 before | Expand all | Expand 10 after
78 static int SetTraceFilter(unsigned int filter); 78 static int SetTraceFilter(unsigned int filter);
79 79
80 // Sets the name of the trace file and enables non-encrypted trace messages. 80 // Sets the name of the trace file and enables non-encrypted trace messages.
81 static int SetTraceFile(const char* fileNameUTF8, 81 static int SetTraceFile(const char* fileNameUTF8,
82 bool addFileCounter = false); 82 bool addFileCounter = false);
83 83
84 // Installs the TraceCallback implementation to ensure that the user 84 // Installs the TraceCallback implementation to ensure that the user
85 // receives callbacks for generated trace messages. 85 // receives callbacks for generated trace messages.
86 static int SetTraceCallback(TraceCallback* callback); 86 static int SetTraceCallback(TraceCallback* callback);
87 87
88 #if !defined(WEBRTC_CHROMIUM_BUILD)
89 static int SetAndroidObjects(void* javaVM, void* context);
90 #endif
91
92 static std::string GetVersionString(); 88 static std::string GetVersionString();
93 89
94 protected: 90 protected:
95 VoiceEngine() {} 91 VoiceEngine() {}
96 ~VoiceEngine() {} 92 ~VoiceEngine() {}
97 }; 93 };
98 94
99 // VoEBase 95 // VoEBase
100 class WEBRTC_DLLEXPORT VoEBase { 96 class WEBRTC_DLLEXPORT VoEBase {
101 public: 97 public:
(...skipping 104 matching lines...) Expand 10 before | Expand all | Expand 10 after
206 virtual int AssociateSendChannel(int channel, int accociate_send_channel) = 0; 202 virtual int AssociateSendChannel(int channel, int accociate_send_channel) = 0;
207 203
208 protected: 204 protected:
209 VoEBase() {} 205 VoEBase() {}
210 virtual ~VoEBase() {} 206 virtual ~VoEBase() {}
211 }; 207 };
212 208
213 } // namespace webrtc 209 } // namespace webrtc
214 210
215 #endif // WEBRTC_VOICE_ENGINE_VOE_BASE_H 211 #endif // WEBRTC_VOICE_ENGINE_VOE_BASE_H
OLDNEW
« no previous file with comments | « webrtc/sdk/android/src/jni/peerconnection_jni.cc ('k') | webrtc/voice_engine/voice_engine_impl.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698