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

Side by Side Diff: content/browser/android/tracing_controller_android.cc

Issue 2237943002: Remove now-unnecessary .obj() in Java method calls. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@switch-context
Patch Set: Rebase *again* :( Created 4 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 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 "content/browser/android/tracing_controller_android.h" 5 #include "content/browser/android/tracing_controller_android.h"
6 6
7 #include "base/android/jni_android.h" 7 #include "base/android/jni_android.h"
8 #include "base/android/jni_string.h" 8 #include "base/android/jni_string.h"
9 #include "base/json/json_writer.h" 9 #include "base/json/json_writer.h"
10 #include "base/logging.h" 10 #include "base/logging.h"
(...skipping 62 matching lines...) Expand 10 before | Expand all | Expand 10 after
73 ScopedJavaLocalRef<jstring> jfilename = 73 ScopedJavaLocalRef<jstring> jfilename =
74 Java_TracingControllerAndroid_generateTracingFilePath(env); 74 Java_TracingControllerAndroid_generateTracingFilePath(env);
75 *file_path = base::FilePath( 75 *file_path = base::FilePath(
76 base::android::ConvertJavaStringToUTF8(env, jfilename.obj())); 76 base::android::ConvertJavaStringToUTF8(env, jfilename.obj()));
77 } 77 }
78 78
79 void TracingControllerAndroid::OnTracingStopped() { 79 void TracingControllerAndroid::OnTracingStopped() {
80 JNIEnv* env = base::android::AttachCurrentThread(); 80 JNIEnv* env = base::android::AttachCurrentThread();
81 base::android::ScopedJavaLocalRef<jobject> obj = weak_java_object_.get(env); 81 base::android::ScopedJavaLocalRef<jobject> obj = weak_java_object_.get(env);
82 if (obj.obj()) 82 if (obj.obj())
83 Java_TracingControllerAndroid_onTracingStopped(env, obj.obj()); 83 Java_TracingControllerAndroid_onTracingStopped(env, obj);
84 } 84 }
85 85
86 bool TracingControllerAndroid::GetKnownCategoryGroupsAsync( 86 bool TracingControllerAndroid::GetKnownCategoryGroupsAsync(
87 JNIEnv* env, 87 JNIEnv* env,
88 const JavaParamRef<jobject>& obj) { 88 const JavaParamRef<jobject>& obj) {
89 if (!TracingController::GetInstance()->GetCategories( 89 if (!TracingController::GetInstance()->GetCategories(
90 base::Bind(&TracingControllerAndroid::OnKnownCategoriesReceived, 90 base::Bind(&TracingControllerAndroid::OnKnownCategoriesReceived,
91 weak_factory_.GetWeakPtr()))) { 91 weak_factory_.GetWeakPtr()))) {
92 return false; 92 return false;
93 } 93 }
(...skipping 21 matching lines...) Expand all
115 base::trace_event::TraceConfig trace_config; 115 base::trace_event::TraceConfig trace_config;
116 return base::android::ConvertUTF8ToJavaString( 116 return base::android::ConvertUTF8ToJavaString(
117 env, trace_config.ToCategoryFilterString()); 117 env, trace_config.ToCategoryFilterString());
118 } 118 }
119 119
120 bool RegisterTracingControllerAndroid(JNIEnv* env) { 120 bool RegisterTracingControllerAndroid(JNIEnv* env) {
121 return RegisterNativesImpl(env); 121 return RegisterNativesImpl(env);
122 } 122 }
123 123
124 } // namespace content 124 } // namespace content
OLDNEW
« no previous file with comments | « content/browser/android/popup_touch_handle_drawable.cc ('k') | content/browser/android/web_contents_observer_proxy.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698