Skip to content
This repository has been archived by the owner on Apr 3, 2020. It is now read-only.

Commit

Permalink
Merge pull request #2577 from rakuco/registernatives-return-value
Browse files Browse the repository at this point in the history
[Android] Stop checking if RegisterNativesImpl() returns >= 0.
  • Loading branch information
Shiliu Wang committed Nov 6, 2014
2 parents bab7845 + 592339f commit 76d746e
Show file tree
Hide file tree
Showing 7 changed files with 7 additions and 7 deletions.
2 changes: 1 addition & 1 deletion extensions/common/android/xwalk_extension_android.cc
Original file line number Diff line number Diff line change
Expand Up @@ -219,7 +219,7 @@ static jlong GetOrCreateExtension(JNIEnv* env, jobject obj, jstring name,
}

bool RegisterXWalkExtensionAndroid(JNIEnv* env) {
return RegisterNativesImpl(env) >= 0;
return RegisterNativesImpl(env);
}

} // namespace extensions
Expand Down
2 changes: 1 addition & 1 deletion runtime/browser/android/xwalk_content.cc
Original file line number Diff line number Diff line change
Expand Up @@ -413,7 +413,7 @@ static jlong Init(JNIEnv* env, jobject obj) {
}

bool RegisterXWalkContent(JNIEnv* env) {
return RegisterNativesImpl(env) >= 0;
return RegisterNativesImpl(env);
}

namespace {
Expand Down
2 changes: 1 addition & 1 deletion runtime/browser/android/xwalk_contents_client_bridge.cc
Original file line number Diff line number Diff line change
Expand Up @@ -470,7 +470,7 @@ void XWalkContentsClientBridge::OnReceivedIcon(const GURL& icon_url,
}

bool RegisterXWalkContentsClientBridge(JNIEnv* env) {
return RegisterNativesImpl(env) >= 0;
return RegisterNativesImpl(env);
}

} // namespace xwalk
2 changes: 1 addition & 1 deletion runtime/browser/android/xwalk_http_auth_handler.cc
Original file line number Diff line number Diff line change
Expand Up @@ -77,7 +77,7 @@ XWalkHttpAuthHandlerBase* XWalkHttpAuthHandlerBase::Create(
}

bool RegisterXWalkHttpAuthHandler(JNIEnv* env) {
return RegisterNativesImpl(env) >= 0;
return RegisterNativesImpl(env);
}

} // namespace xwalk
2 changes: 1 addition & 1 deletion runtime/browser/android/xwalk_path_helper.cc
Original file line number Diff line number Diff line change
Expand Up @@ -38,7 +38,7 @@ static void SetDirectory(JNIEnv* env, jclass clazz,
}

bool RegisterXWalkPathHelper(JNIEnv* env) {
return RegisterNativesImpl(env) >= 0;
return RegisterNativesImpl(env);
}

} // namespace xwalk
2 changes: 1 addition & 1 deletion runtime/browser/android/xwalk_settings.cc
Original file line number Diff line number Diff line change
Expand Up @@ -237,7 +237,7 @@ static jstring GetDefaultUserAgent(JNIEnv* env, jclass clazz) {
}

bool RegisterXWalkSettings(JNIEnv* env) {
return RegisterNativesImpl(env) >= 0;
return RegisterNativesImpl(env);
}

} // namespace xwalk
2 changes: 1 addition & 1 deletion runtime/browser/android/xwalk_view_delegate.cc
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ jboolean IsLibraryBuiltForIA(JNIEnv* env, jclass jcaller) {
}

bool RegisterXWalkViewDelegate(JNIEnv* env) {
return RegisterNativesImpl(env) >= 0;
return RegisterNativesImpl(env);
}

} // namespace xwalk

0 comments on commit 76d746e

Please sign in to comment.