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

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

Issue 1259613002: Revert of Hook up the Push API with GCM's new ability to own encryption keys. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@gcm-encryption
Patch Set: 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
« no previous file with comments | « components/gcm_driver/gcm_driver_android.h ('k') | components/gcm_driver/gcm_driver_desktop.cc » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
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 "base/android/jni_android.h" 7 #include "base/android/jni_android.h"
8 #include "base/android/jni_array.h" 8 #include "base/android/jni_array.h"
9 #include "base/android/jni_string.h" 9 #include "base/android/jni_string.h"
10 #include "base/compiler_specific.h" 10 #include "base/compiler_specific.h"
11 #include "base/logging.h" 11 #include "base/logging.h"
12 #include "jni/GCMDriver_jni.h" 12 #include "jni/GCMDriver_jni.h"
13 13
14 using base::android::AppendJavaStringArrayToStringVector; 14 using base::android::AppendJavaStringArrayToStringVector;
15 using base::android::AttachCurrentThread; 15 using base::android::AttachCurrentThread;
16 using base::android::ConvertJavaStringToUTF8; 16 using base::android::ConvertJavaStringToUTF8;
17 using base::android::ConvertUTF8ToJavaString; 17 using base::android::ConvertUTF8ToJavaString;
18 using base::android::ToJavaArrayOfStrings; 18 using base::android::ToJavaArrayOfStrings;
19 19
20 namespace gcm { 20 namespace gcm {
21 21
22 GCMDriverAndroid::GCMDriverAndroid( 22 GCMDriverAndroid::GCMDriverAndroid() {
23 const base::FilePath& store_path,
24 const scoped_refptr<base::SequencedTaskRunner>& blocking_task_runner)
25 : GCMDriver(store_path, blocking_task_runner) {
26 JNIEnv* env = AttachCurrentThread(); 23 JNIEnv* env = AttachCurrentThread();
27 java_ref_.Reset( 24 java_ref_.Reset(
28 Java_GCMDriver_create(env, 25 Java_GCMDriver_create(env,
29 reinterpret_cast<intptr_t>(this), 26 reinterpret_cast<intptr_t>(this),
30 base::android::GetApplicationContext())); 27 base::android::GetApplicationContext()));
31 } 28 }
32 29
33 GCMDriverAndroid::~GCMDriverAndroid() { 30 GCMDriverAndroid::~GCMDriverAndroid() {
34 JNIEnv* env = AttachCurrentThread(); 31 JNIEnv* env = AttachCurrentThread();
35 Java_GCMDriver_destroy(env, java_ref_.obj()); 32 Java_GCMDriver_destroy(env, java_ref_.obj());
(...skipping 170 matching lines...) Expand 10 before | Expand all | Expand 10 after
206 ConvertUTF8ToJavaString(env, sender_id).Release()); 203 ConvertUTF8ToJavaString(env, sender_id).Release());
207 } 204 }
208 205
209 void GCMDriverAndroid::SendImpl(const std::string& app_id, 206 void GCMDriverAndroid::SendImpl(const std::string& app_id,
210 const std::string& receiver_id, 207 const std::string& receiver_id,
211 const OutgoingMessage& message) { 208 const OutgoingMessage& message) {
212 NOTIMPLEMENTED(); 209 NOTIMPLEMENTED();
213 } 210 }
214 211
215 } // namespace gcm 212 } // namespace gcm
OLDNEW
« no previous file with comments | « components/gcm_driver/gcm_driver_android.h ('k') | components/gcm_driver/gcm_driver_desktop.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698