chrome/browser/invalidation/invalidation_service_factory_android.h - Issue 1308363003: Revert of jni_generator: Make all object-returning natives return ScopedJavaLocalRef.

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

Unified Diff: chrome/browser/invalidation/invalidation_service_factory_android.h

Issue 1308363003: Revert of jni_generator: Make all object-returning natives return ScopedJavaLocalRef. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

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 side-by-side diff with in-line comments

Download patch

« no previous file with comments | « chrome/browser/dom_distiller/tab_utils_android.cc ('k') | chrome/browser/invalidation/invalidation_service_factory_android.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: chrome/browser/invalidation/invalidation_service_factory_android.h

diff --git a/chrome/browser/invalidation/invalidation_service_factory_android.h b/chrome/browser/invalidation/invalidation_service_factory_android.h

index ed3d9aeec0d10d877faa7b844024c76e9a397287..c4edb3aabc1531e34016a09c93e6cf21469dade7 100644

--- a/chrome/browser/invalidation/invalidation_service_factory_android.h

+++ b/chrome/browser/invalidation/invalidation_service_factory_android.h

@@ -1,4 +1,4 @@

// Use of this source code is governed by a BSD-style license that can be

// found in the LICENSE file.

@@ -6,7 +6,6 @@

#define CHROME_BROWSER_INVALIDATION_INVALIDATION_SERVICE_FACTORY_ANDROID_H_

#include <jni.h>

-#include "base/android/scoped_java_ref.h"

namespace invalidation {

@@ -14,12 +13,8 @@

// InvalidationServiceFactory.

class InvalidationServiceFactoryAndroid {

public:

- static base::android::ScopedJavaLocalRef<jobject>

- GetForProfile(JNIEnv* env, jclass clazz, jobject j_profile);

- static base::android::ScopedJavaLocalRef<jobject>

- GetForTest(JNIEnv* env, jclass clazz, jobject j_context);

+ static jobject GetForProfile(JNIEnv* env, jclass clazz, jobject j_profile);

+ static jobject GetForTest(JNIEnv* env, jclass clazz, jobject j_context);

static bool Register(JNIEnv* env);

};