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

Side by Side Diff: remoting/client/jni/chromoting_jni_runtime.cc

Issue 810133003: replace NULL->nullptr in src/remoting. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 5 years, 11 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 | « remoting/client/audio_decode_scheduler.cc ('k') | remoting/client/jni/jni_frame_consumer.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 2013 The Chromium Authors. All rights reserved. 1 // Copyright 2013 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 "remoting/client/jni/chromoting_jni_runtime.h" 5 #include "remoting/client/jni/chromoting_jni_runtime.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/android/scoped_java_ref.h" 10 #include "base/android/scoped_java_ref.h"
(...skipping 28 matching lines...) Expand all
39 // points for JNI calls from Java into C++. 39 // points for JNI calls from Java into C++.
40 40
41 static void LoadNative(JNIEnv* env, jclass clazz, jobject context) { 41 static void LoadNative(JNIEnv* env, jclass clazz, jobject context) {
42 base::android::ScopedJavaLocalRef<jobject> context_activity(env, context); 42 base::android::ScopedJavaLocalRef<jobject> context_activity(env, context);
43 base::android::InitApplicationContext(env, context_activity); 43 base::android::InitApplicationContext(env, context_activity);
44 44
45 // The google_apis functions check the command-line arguments to make sure no 45 // The google_apis functions check the command-line arguments to make sure no
46 // runtime API keys have been specified by the environment. Unfortunately, we 46 // runtime API keys have been specified by the environment. Unfortunately, we
47 // neither launch Chromium nor have a command line, so we need to prevent 47 // neither launch Chromium nor have a command line, so we need to prevent
48 // them from DCHECKing out when they go looking. 48 // them from DCHECKing out when they go looking.
49 base::CommandLine::Init(0, NULL); 49 base::CommandLine::Init(0, nullptr);
50 50
51 // Create the singleton now so that the Chromoting threads will be set up. 51 // Create the singleton now so that the Chromoting threads will be set up.
52 remoting::ChromotingJniRuntime::GetInstance(); 52 remoting::ChromotingJniRuntime::GetInstance();
53 } 53 }
54 54
55 static jstring GetApiKey(JNIEnv* env, jclass clazz) { 55 static jstring GetApiKey(JNIEnv* env, jclass clazz) {
56 return ConvertUTF8ToJavaString( 56 return ConvertUTF8ToJavaString(
57 env, google_apis::GetAPIKey().c_str()).Release(); 57 env, google_apis::GetAPIKey().c_str()).Release();
58 } 58 }
59 59
(...skipping 178 matching lines...) Expand 10 before | Expand all | Expand 10 after
238 host_pubkey, 238 host_pubkey,
239 pairing_id, 239 pairing_id,
240 pairing_secret, 240 pairing_secret,
241 capabilities); 241 capabilities);
242 } 242 }
243 243
244 void ChromotingJniRuntime::DisconnectFromHost() { 244 void ChromotingJniRuntime::DisconnectFromHost() {
245 DCHECK(ui_task_runner_->BelongsToCurrentThread()); 245 DCHECK(ui_task_runner_->BelongsToCurrentThread());
246 if (session_.get()) { 246 if (session_.get()) {
247 session_->Disconnect(); 247 session_->Disconnect();
248 session_ = NULL; 248 session_ = nullptr;
249 } 249 }
250 } 250 }
251 251
252 void ChromotingJniRuntime::OnConnectionState( 252 void ChromotingJniRuntime::OnConnectionState(
253 protocol::ConnectionToHost::State state, 253 protocol::ConnectionToHost::State state,
254 protocol::ErrorCode error) { 254 protocol::ErrorCode error) {
255 DCHECK(ui_task_runner_->BelongsToCurrentThread()); 255 DCHECK(ui_task_runner_->BelongsToCurrentThread());
256 256
257 JNIEnv* env = base::android::AttachCurrentThread(); 257 JNIEnv* env = base::android::AttachCurrentThread();
258 Java_JniInterface_onConnectionState(env, state, error); 258 Java_JniInterface_onConnectionState(env, state, error);
(...skipping 98 matching lines...) Expand 10 before | Expand all | Expand 10 after
357 357
358 JNIEnv* env = base::android::AttachCurrentThread(); 358 JNIEnv* env = base::android::AttachCurrentThread();
359 Java_JniInterface_redrawGraphicsInternal(env); 359 Java_JniInterface_redrawGraphicsInternal(env);
360 } 360 }
361 361
362 void ChromotingJniRuntime::DetachFromVmAndSignal(base::WaitableEvent* waiter) { 362 void ChromotingJniRuntime::DetachFromVmAndSignal(base::WaitableEvent* waiter) {
363 base::android::DetachFromVM(); 363 base::android::DetachFromVM();
364 waiter->Signal(); 364 waiter->Signal();
365 } 365 }
366 } // namespace remoting 366 } // namespace remoting
OLDNEW
« no previous file with comments | « remoting/client/audio_decode_scheduler.cc ('k') | remoting/client/jni/jni_frame_consumer.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698