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

Side by Side Diff: components/gcm_driver/gcm_driver_android.cc

Issue 1294333002: Fix wrong usages of ScopedJavaLocalRef::Release(). (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Add comment to Release() explaining it should not be used to call java methods Created 5 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 unified diff | Download patch
OLDNEW
1 // Copyright 2014 The Chromium Authors. All rights reserved. 1 // Copyright 2014 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 "components/gcm_driver/gcm_driver_android.h" 5 #include "components/gcm_driver/gcm_driver_android.h"
6 6
7 #include <stdint.h> 7 #include <stdint.h>
8 8
9 #include "base/android/jni_android.h" 9 #include "base/android/jni_android.h"
10 #include "base/android/jni_array.h" 10 #include "base/android/jni_array.h"
(...skipping 178 matching lines...) Expand 10 before | Expand all | Expand 10 after
189 GCMClient::Result GCMDriverAndroid::EnsureStarted( 189 GCMClient::Result GCMDriverAndroid::EnsureStarted(
190 GCMClient::StartMode start_mode) { 190 GCMClient::StartMode start_mode) {
191 // TODO(johnme): Maybe we should check if GMS is available? 191 // TODO(johnme): Maybe we should check if GMS is available?
192 return GCMClient::SUCCESS; 192 return GCMClient::SUCCESS;
193 } 193 }
194 194
195 void GCMDriverAndroid::RegisterImpl( 195 void GCMDriverAndroid::RegisterImpl(
196 const std::string& app_id, const std::vector<std::string>& sender_ids) { 196 const std::string& app_id, const std::vector<std::string>& sender_ids) {
197 DCHECK_EQ(1u, sender_ids.size()); 197 DCHECK_EQ(1u, sender_ids.size());
198 JNIEnv* env = AttachCurrentThread(); 198 JNIEnv* env = AttachCurrentThread();
199 Java_GCMDriver_register( 199 Java_GCMDriver_register(env, java_ref_.obj(),
200 env, java_ref_.obj(), 200 ConvertUTF8ToJavaString(env, app_id).obj(),
201 ConvertUTF8ToJavaString(env, app_id).Release(), 201 ConvertUTF8ToJavaString(env, sender_ids[0]).obj());
202 ConvertUTF8ToJavaString(env, sender_ids[0]).Release());
203 } 202 }
204 203
205 void GCMDriverAndroid::UnregisterImpl(const std::string& app_id) { 204 void GCMDriverAndroid::UnregisterImpl(const std::string& app_id) {
206 NOTREACHED(); 205 NOTREACHED();
207 } 206 }
208 207
209 void GCMDriverAndroid::UnregisterWithSenderIdImpl( 208 void GCMDriverAndroid::UnregisterWithSenderIdImpl(
210 const std::string& app_id, const std::string& sender_id) { 209 const std::string& app_id, const std::string& sender_id) {
211 JNIEnv* env = AttachCurrentThread(); 210 JNIEnv* env = AttachCurrentThread();
212 Java_GCMDriver_unregister( 211 Java_GCMDriver_unregister(env, java_ref_.obj(),
213 env, java_ref_.obj(), 212 ConvertUTF8ToJavaString(env, app_id).obj(),
214 ConvertUTF8ToJavaString(env, app_id).Release(), 213 ConvertUTF8ToJavaString(env, sender_id).obj());
215 ConvertUTF8ToJavaString(env, sender_id).Release());
216 } 214 }
217 215
218 void GCMDriverAndroid::SendImpl(const std::string& app_id, 216 void GCMDriverAndroid::SendImpl(const std::string& app_id,
219 const std::string& receiver_id, 217 const std::string& receiver_id,
220 const OutgoingMessage& message) { 218 const OutgoingMessage& message) {
221 NOTIMPLEMENTED(); 219 NOTIMPLEMENTED();
222 } 220 }
223 221
224 } // namespace gcm 222 } // namespace gcm
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698