Commit 12629605 authored by Yipeng Wang's avatar Yipeng Wang Committed by Commit Bot

Delete JNI registration calls in chrome/browser/ui

This CL deletes all JNI registration calls under chrome/browser/ui since
the JNI registration is automatic now.

Change-Id: Id3a0bf6fe0d3bdc413e878324b732979ce0536fc
Reviewed-on: https://chromium-review.googlesource.com/572189Reviewed-by: default avatarYaron Friedman <yfriedman@chromium.org>
Commit-Queue: Yipeng Wang <yipengw@chromium.org>
Cr-Commit-Position: refs/heads/master@{#487074}
parent 85285744
...@@ -2328,7 +2328,6 @@ split_static_library("ui") { ...@@ -2328,7 +2328,6 @@ split_static_library("ui") {
"android/infobars/search_geolocation_disclosure_infobar.cc", "android/infobars/search_geolocation_disclosure_infobar.cc",
"android/infobars/search_geolocation_disclosure_infobar.h", "android/infobars/search_geolocation_disclosure_infobar.h",
"android/infobars/simple_confirm_infobar_builder.cc", "android/infobars/simple_confirm_infobar_builder.cc",
"android/infobars/simple_confirm_infobar_builder.h",
"android/infobars/translate_compact_infobar.cc", "android/infobars/translate_compact_infobar.cc",
"android/infobars/translate_compact_infobar.h", "android/infobars/translate_compact_infobar.h",
"android/infobars/translate_infobar.cc", "android/infobars/translate_infobar.cc",
...@@ -2343,9 +2342,7 @@ split_static_library("ui") { ...@@ -2343,9 +2342,7 @@ split_static_library("ui") {
"android/omnibox/omnibox_view_util.cc", "android/omnibox/omnibox_view_util.cc",
"android/omnibox/omnibox_view_util.h", "android/omnibox/omnibox_view_util.h",
"android/page_info/certificate_chain_helper.cc", "android/page_info/certificate_chain_helper.cc",
"android/page_info/certificate_chain_helper.h",
"android/page_info/certificate_viewer_android.cc", "android/page_info/certificate_viewer_android.cc",
"android/page_info/certificate_viewer_android.h",
"android/page_info/connection_info_popup_android.cc", "android/page_info/connection_info_popup_android.cc",
"android/page_info/connection_info_popup_android.h", "android/page_info/connection_info_popup_android.h",
"android/page_info/page_info_popup_android.cc", "android/page_info/page_info_popup_android.cc",
...@@ -2354,13 +2351,11 @@ split_static_library("ui") { ...@@ -2354,13 +2351,11 @@ split_static_library("ui") {
"android/snackbars/auto_signin_prompt_controller.cc", "android/snackbars/auto_signin_prompt_controller.cc",
"android/snackbars/auto_signin_prompt_controller.h", "android/snackbars/auto_signin_prompt_controller.h",
"android/ssl_client_certificate_request.cc", "android/ssl_client_certificate_request.cc",
"android/ssl_client_certificate_request.h",
"android/tab_contents/chrome_web_contents_view_delegate_android.cc", "android/tab_contents/chrome_web_contents_view_delegate_android.cc",
"android/tab_contents/chrome_web_contents_view_delegate_android.h", "android/tab_contents/chrome_web_contents_view_delegate_android.h",
"android/tab_model/android_live_tab_context.cc", "android/tab_model/android_live_tab_context.cc",
"android/tab_model/android_live_tab_context.h", "android/tab_model/android_live_tab_context.h",
"android/tab_model/single_tab_model.cc", "android/tab_model/single_tab_model.cc",
"android/tab_model/single_tab_model.h",
"android/tab_model/tab_model.cc", "android/tab_model/tab_model.cc",
"android/tab_model/tab_model.h", "android/tab_model/tab_model.h",
"android/tab_model/tab_model_jni_bridge.cc", "android/tab_model/tab_model_jni_bridge.cc",
......
...@@ -174,10 +174,4 @@ void AutofillKeyboardAccessoryView::ViewDismissed( ...@@ -174,10 +174,4 @@ void AutofillKeyboardAccessoryView::ViewDismissed(
delete this; delete this;
} }
// static
bool AutofillKeyboardAccessoryView::RegisterAutofillKeyboardAccessoryView(
JNIEnv* env) {
return RegisterNativesImpl(env);
}
} // namespace autofill } // namespace autofill
...@@ -45,8 +45,6 @@ class AutofillKeyboardAccessoryView : public AutofillPopupView { ...@@ -45,8 +45,6 @@ class AutofillKeyboardAccessoryView : public AutofillPopupView {
void ViewDismissed(JNIEnv* env, void ViewDismissed(JNIEnv* env,
const base::android::JavaParamRef<jobject>& obj); const base::android::JavaParamRef<jobject>& obj);
static bool RegisterAutofillKeyboardAccessoryView(JNIEnv* env);
protected: protected:
// AutofillPopupView implementation. // AutofillPopupView implementation.
void Show() override; void Show() override;
......
...@@ -175,11 +175,6 @@ void AutofillPopupViewAndroid::PopupDismissed( ...@@ -175,11 +175,6 @@ void AutofillPopupViewAndroid::PopupDismissed(
delete this; delete this;
} }
// static
bool AutofillPopupViewAndroid::RegisterAutofillPopupViewAndroid(JNIEnv* env) {
return RegisterNativesImpl(env);
}
// static // static
AutofillPopupView* AutofillPopupView::Create( AutofillPopupView* AutofillPopupView::Create(
AutofillPopupController* controller) { AutofillPopupController* controller) {
......
...@@ -40,8 +40,6 @@ class AutofillPopupViewAndroid : public AutofillPopupView { ...@@ -40,8 +40,6 @@ class AutofillPopupViewAndroid : public AutofillPopupView {
void PopupDismissed(JNIEnv* env, void PopupDismissed(JNIEnv* env,
const base::android::JavaParamRef<jobject>& obj); const base::android::JavaParamRef<jobject>& obj);
static bool RegisterAutofillPopupViewAndroid(JNIEnv* env);
protected: protected:
// AutofillPopupView implementation. // AutofillPopupView implementation.
void Show() override; void Show() override;
......
...@@ -128,9 +128,4 @@ void CardUnmaskPromptViewAndroid::GotVerificationResult( ...@@ -128,9 +128,4 @@ void CardUnmaskPromptViewAndroid::GotVerificationResult(
allow_retry); allow_retry);
} }
// static
bool CardUnmaskPromptViewAndroid::Register(JNIEnv* env) {
return RegisterNativesImpl(env);
}
} // namespace autofill } // namespace autofill
...@@ -50,8 +50,6 @@ class CardUnmaskPromptViewAndroid : public CardUnmaskPromptView { ...@@ -50,8 +50,6 @@ class CardUnmaskPromptViewAndroid : public CardUnmaskPromptView {
void GotVerificationResult(const base::string16& error_message, void GotVerificationResult(const base::string16& error_message,
bool allow_retry) override; bool allow_retry) override;
static bool Register(JNIEnv* env);
private: private:
~CardUnmaskPromptViewAndroid() override; ~CardUnmaskPromptViewAndroid() override;
......
...@@ -39,11 +39,6 @@ std::unique_ptr<CreditCardScannerView> CreditCardScannerView::Create( ...@@ -39,11 +39,6 @@ std::unique_ptr<CreditCardScannerView> CreditCardScannerView::Create(
new CreditCardScannerViewAndroid(delegate, web_contents)); new CreditCardScannerViewAndroid(delegate, web_contents));
} }
// static
bool CreditCardScannerViewAndroid::Register(JNIEnv* env) {
return RegisterNativesImpl(env);
}
CreditCardScannerViewAndroid::CreditCardScannerViewAndroid( CreditCardScannerViewAndroid::CreditCardScannerViewAndroid(
const base::WeakPtr<CreditCardScannerViewDelegate>& delegate, const base::WeakPtr<CreditCardScannerViewDelegate>& delegate,
content::WebContents* web_contents) content::WebContents* web_contents)
......
...@@ -24,9 +24,6 @@ class CreditCardScannerViewDelegate; ...@@ -24,9 +24,6 @@ class CreditCardScannerViewDelegate;
// APIs through JNI service. // APIs through JNI service.
class CreditCardScannerViewAndroid : public CreditCardScannerView { class CreditCardScannerViewAndroid : public CreditCardScannerView {
public: public:
// Registers with JNI services.
static bool Register(JNIEnv* env);
CreditCardScannerViewAndroid( CreditCardScannerViewAndroid(
const base::WeakPtr<CreditCardScannerViewDelegate>& delegate, const base::WeakPtr<CreditCardScannerViewDelegate>& delegate,
content::WebContents* web_contents); content::WebContents* web_contents);
......
...@@ -50,11 +50,6 @@ void PasswordGenerationPopupViewAndroid::PasswordSelected( ...@@ -50,11 +50,6 @@ void PasswordGenerationPopupViewAndroid::PasswordSelected(
controller_->PasswordAccepted(); controller_->PasswordAccepted();
} }
// static
bool PasswordGenerationPopupViewAndroid::Register(JNIEnv* env) {
return RegisterNativesImpl(env);
}
PasswordGenerationPopupViewAndroid::~PasswordGenerationPopupViewAndroid() {} PasswordGenerationPopupViewAndroid::~PasswordGenerationPopupViewAndroid() {}
void PasswordGenerationPopupViewAndroid::Show() { void PasswordGenerationPopupViewAndroid::Show() {
......
...@@ -36,9 +36,6 @@ class PasswordGenerationPopupViewAndroid : public PasswordGenerationPopupView { ...@@ -36,9 +36,6 @@ class PasswordGenerationPopupViewAndroid : public PasswordGenerationPopupView {
void PasswordSelected(JNIEnv* env, void PasswordSelected(JNIEnv* env,
const base::android::JavaParamRef<jobject>& object); const base::android::JavaParamRef<jobject>& object);
// Registers the popup with JNI.
static bool Register(JNIEnv* env);
private: private:
// The popup owns itself. // The popup owns itself.
virtual ~PasswordGenerationPopupViewAndroid(); virtual ~PasswordGenerationPopupViewAndroid();
......
...@@ -159,11 +159,6 @@ void BluetoothChooserAndroid::ShowNeedLocationPermissionLink( ...@@ -159,11 +159,6 @@ void BluetoothChooserAndroid::ShowNeedLocationPermissionLink(
event_handler_.Run(Event::SHOW_NEED_LOCATION_HELP, ""); event_handler_.Run(Event::SHOW_NEED_LOCATION_HELP, "");
} }
// static
bool BluetoothChooserAndroid::Register(JNIEnv* env) {
return RegisterNativesImpl(env);
}
void BluetoothChooserAndroid::OpenURL(const char* url) { void BluetoothChooserAndroid::OpenURL(const char* url) {
web_contents_->OpenURL(content::OpenURLParams( web_contents_->OpenURL(content::OpenURLParams(
GURL(url), content::Referrer(), WindowOpenDisposition::NEW_FOREGROUND_TAB, GURL(url), content::Referrer(), WindowOpenDisposition::NEW_FOREGROUND_TAB,
......
...@@ -50,8 +50,6 @@ class BluetoothChooserAndroid : public content::BluetoothChooser { ...@@ -50,8 +50,6 @@ class BluetoothChooserAndroid : public content::BluetoothChooser {
JNIEnv* env, JNIEnv* env,
const base::android::JavaParamRef<jobject>& obj); const base::android::JavaParamRef<jobject>& obj);
static bool Register(JNIEnv* env);
private: private:
void OpenURL(const char* url); void OpenURL(const char* url);
base::android::ScopedJavaGlobalRef<jobject> java_dialog_; base::android::ScopedJavaGlobalRef<jobject> java_dialog_;
......
...@@ -82,8 +82,3 @@ ScopedJavaLocalRef<jstring> ChromeHttpAuthHandler::GetMessageBody( ...@@ -82,8 +82,3 @@ ScopedJavaLocalRef<jstring> ChromeHttpAuthHandler::GetMessageBody(
return ConvertUTF16ToJavaString( return ConvertUTF16ToJavaString(
env, authority_ + base::ASCIIToUTF16(" ") + explanation_); env, authority_ + base::ASCIIToUTF16(" ") + explanation_);
} }
// static
bool ChromeHttpAuthHandler::RegisterChromeHttpAuthHandler(JNIEnv* env) {
return RegisterNativesImpl(env);
}
...@@ -55,8 +55,6 @@ class ChromeHttpAuthHandler { ...@@ -55,8 +55,6 @@ class ChromeHttpAuthHandler {
base::android::ScopedJavaLocalRef<jstring> GetMessageBody( base::android::ScopedJavaLocalRef<jstring> GetMessageBody(
JNIEnv* env, JNIEnv* env,
const base::android::JavaParamRef<jobject>&); const base::android::JavaParamRef<jobject>&);
// Registers the ChromeHttpAuthHandler native methods.
static bool RegisterChromeHttpAuthHandler(JNIEnv* env);
private: private:
LoginHandler* observer_; LoginHandler* observer_;
base::android::ScopedJavaGlobalRef<jobject> java_chrome_http_auth_handler_; base::android::ScopedJavaGlobalRef<jobject> java_chrome_http_auth_handler_;
......
...@@ -228,7 +228,3 @@ void ContextMenuHelper::RetrieveImageInternal( ...@@ -228,7 +228,3 @@ void ContextMenuHelper::RetrieveImageInternal(
base::Bind(retrieve_callback, base::Passed(&thumbnail_capturer), base::Bind(retrieve_callback, base::Passed(&thumbnail_capturer),
base::android::ScopedJavaGlobalRef<jobject>(env, jcallback))); base::android::ScopedJavaGlobalRef<jobject>(env, jcallback)));
} }
bool RegisterContextMenuHelper(JNIEnv* env) {
return RegisterNativesImpl(env);
}
...@@ -85,6 +85,4 @@ class ContextMenuHelper ...@@ -85,6 +85,4 @@ class ContextMenuHelper
DISALLOW_COPY_AND_ASSIGN(ContextMenuHelper); DISALLOW_COPY_AND_ASSIGN(ContextMenuHelper);
}; };
bool RegisterContextMenuHelper(JNIEnv* env);
#endif // CHROME_BROWSER_UI_ANDROID_CONTEXT_MENU_HELPER_H_ #endif // CHROME_BROWSER_UI_ANDROID_CONTEXT_MENU_HELPER_H_
...@@ -43,11 +43,6 @@ void AutofillSaveCardInfoBar::OnLegalMessageLinkClicked(JNIEnv* env, ...@@ -43,11 +43,6 @@ void AutofillSaveCardInfoBar::OnLegalMessageLinkClicked(JNIEnv* env,
GURL(base::android::ConvertJavaStringToUTF16(env, url))); GURL(base::android::ConvertJavaStringToUTF16(env, url)));
} }
// static
bool AutofillSaveCardInfoBar::Register(JNIEnv* env) {
return RegisterNativesImpl(env);
}
base::android::ScopedJavaLocalRef<jobject> base::android::ScopedJavaLocalRef<jobject>
AutofillSaveCardInfoBar::CreateRenderInfoBar(JNIEnv* env) { AutofillSaveCardInfoBar::CreateRenderInfoBar(JNIEnv* env) {
autofill::AutofillSaveCardInfoBarDelegateMobile* delegate = autofill::AutofillSaveCardInfoBarDelegateMobile* delegate =
......
...@@ -27,9 +27,6 @@ class AutofillSaveCardInfoBar : public ConfirmInfoBar { ...@@ -27,9 +27,6 @@ class AutofillSaveCardInfoBar : public ConfirmInfoBar {
// Called when a link in the legal message text was clicked. // Called when a link in the legal message text was clicked.
void OnLegalMessageLinkClicked(JNIEnv* env, jobject obj, jstring url); void OnLegalMessageLinkClicked(JNIEnv* env, jobject obj, jstring url);
// Registers the JNI bindings.
static bool Register(JNIEnv* env);
private: private:
// ConfirmInfoBar: // ConfirmInfoBar:
base::android::ScopedJavaLocalRef<jobject> CreateRenderInfoBar( base::android::ScopedJavaLocalRef<jobject> CreateRenderInfoBar(
......
...@@ -84,10 +84,3 @@ void InfoBarAndroid::CloseJavaInfoBar() { ...@@ -84,10 +84,3 @@ void InfoBarAndroid::CloseJavaInfoBar() {
int InfoBarAndroid::GetEnumeratedIconId() { int InfoBarAndroid::GetEnumeratedIconId() {
return ResourceMapper::MapFromChromiumId(delegate()->GetIconId()); return ResourceMapper::MapFromChromiumId(delegate()->GetIconId());
} }
// Native JNI methods ---------------------------------------------------------
bool RegisterNativeInfoBar(JNIEnv* env) {
return RegisterNativesImpl(env);
}
...@@ -81,7 +81,4 @@ class InfoBarAndroid : public infobars::InfoBar { ...@@ -81,7 +81,4 @@ class InfoBarAndroid : public infobars::InfoBar {
DISALLOW_COPY_AND_ASSIGN(InfoBarAndroid); DISALLOW_COPY_AND_ASSIGN(InfoBarAndroid);
}; };
// Registers the NativeInfoBar's native methods through JNI.
bool RegisterNativeInfoBar(JNIEnv* env);
#endif // CHROME_BROWSER_UI_ANDROID_INFOBARS_INFOBAR_ANDROID_H_ #endif // CHROME_BROWSER_UI_ANDROID_INFOBARS_INFOBAR_ANDROID_H_
...@@ -109,7 +109,3 @@ static jlong Init(JNIEnv* env, const JavaParamRef<jobject>& obj) { ...@@ -109,7 +109,3 @@ static jlong Init(JNIEnv* env, const JavaParamRef<jobject>& obj) {
new InfoBarContainerAndroid(env, obj); new InfoBarContainerAndroid(env, obj);
return reinterpret_cast<intptr_t>(infobar_container); return reinterpret_cast<intptr_t>(infobar_container);
} }
bool RegisterInfoBarContainer(JNIEnv* env) {
return RegisterNativesImpl(env);
}
...@@ -52,7 +52,4 @@ class InfoBarContainerAndroid : public infobars::InfoBarContainer { ...@@ -52,7 +52,4 @@ class InfoBarContainerAndroid : public infobars::InfoBarContainer {
DISALLOW_COPY_AND_ASSIGN(InfoBarContainerAndroid); DISALLOW_COPY_AND_ASSIGN(InfoBarContainerAndroid);
}; };
// Registers the InfoBarContainer's native methods through JNI.
bool RegisterInfoBarContainer(JNIEnv* env);
#endif // CHROME_BROWSER_UI_ANDROID_INFOBARS_INFOBAR_CONTAINER_ANDROID_H_ #endif // CHROME_BROWSER_UI_ANDROID_INFOBARS_INFOBAR_CONTAINER_ANDROID_H_
...@@ -66,7 +66,3 @@ void Create(JNIEnv* env, ...@@ -66,7 +66,3 @@ void Create(JNIEnv* env,
service->AddInfoBar(base::MakeUnique<ReaderModeInfoBar>( service->AddInfoBar(base::MakeUnique<ReaderModeInfoBar>(
base::MakeUnique<ReaderModeInfoBarDelegate>())); base::MakeUnique<ReaderModeInfoBarDelegate>()));
} }
bool RegisterReaderModeInfoBar(JNIEnv* env) {
return RegisterNativesImpl(env);
}
...@@ -35,7 +35,4 @@ class ReaderModeInfoBar : public InfoBarAndroid { ...@@ -35,7 +35,4 @@ class ReaderModeInfoBar : public InfoBarAndroid {
DISALLOW_COPY_AND_ASSIGN(ReaderModeInfoBar); DISALLOW_COPY_AND_ASSIGN(ReaderModeInfoBar);
}; };
// Register native methods.
bool RegisterReaderModeInfoBar(JNIEnv* env);
#endif // CHROME_BROWSER_UI_ANDROID_INFOBARS_READER_MODE_INFOBAR_H_ #endif // CHROME_BROWSER_UI_ANDROID_INFOBARS_READER_MODE_INFOBAR_H_
...@@ -2,8 +2,6 @@ ...@@ -2,8 +2,6 @@
// Use of this source code is governed by a BSD-style license that can be // Use of this source code is governed by a BSD-style license that can be
// found in the LICENSE file. // found in the LICENSE file.
#include "chrome/browser/ui/android/infobars/simple_confirm_infobar_builder.h"
#include <memory> #include <memory>
#include "base/android/jni_android.h" #include "base/android/jni_android.h"
...@@ -164,7 +162,3 @@ void Create(JNIEnv* env, ...@@ -164,7 +162,3 @@ void Create(JNIEnv* env,
j_listener, infobar_identifier, icon_bitmap, message_str, primary_str, j_listener, infobar_identifier, icon_bitmap, message_str, primary_str,
secondary_str, auto_expire))); secondary_str, auto_expire)));
} }
bool RegisterSimpleConfirmInfoBarBuilder(JNIEnv* env) {
return RegisterNativesImpl(env);
}
// Copyright 2016 The Chromium Authors. All rights reserved.
// Use of this source code is governed by a BSD-style license that can be
// found in the LICENSE file.
#ifndef CHROME_BROWSER_UI_ANDROID_INFOBARS_SIMPLE_CONFIRM_INFOBAR_BUILDER_H_
#define CHROME_BROWSER_UI_ANDROID_INFOBARS_SIMPLE_CONFIRM_INFOBAR_BUILDER_H_
#include "base/android/jni_android.h"
// Registers native methods.
bool RegisterSimpleConfirmInfoBarBuilder(JNIEnv* env);
#endif // CHROME_BROWSER_UI_ANDROID_INFOBARS_SIMPLE_CONFIRM_INFOBAR_BUILDER_H_
...@@ -207,10 +207,3 @@ bool TranslateCompactInfoBar::IsDeclinedByUser() { ...@@ -207,10 +207,3 @@ bool TranslateCompactInfoBar::IsDeclinedByUser() {
// Whether there is any affirmative action bit. // Whether there is any affirmative action bit.
return action_flags_ == FLAG_NONE; return action_flags_ == FLAG_NONE;
} }
// Native JNI methods ---------------------------------------------------------
// static
bool RegisterTranslateCompactInfoBar(JNIEnv* env) {
return RegisterNativesImpl(env);
}
...@@ -93,7 +93,4 @@ class TranslateCompactInfoBar ...@@ -93,7 +93,4 @@ class TranslateCompactInfoBar
DISALLOW_COPY_AND_ASSIGN(TranslateCompactInfoBar); DISALLOW_COPY_AND_ASSIGN(TranslateCompactInfoBar);
}; };
// Registers the native methods through JNI.
bool RegisterTranslateCompactInfoBar(JNIEnv* env);
#endif // CHROME_BROWSER_UI_ANDROID_INFOBARS_TRANSLATE_COMPACT_INFOBAR_H_ #endif // CHROME_BROWSER_UI_ANDROID_INFOBARS_TRANSLATE_COMPACT_INFOBAR_H_
...@@ -158,10 +158,3 @@ bool TranslateInfoBar::ShouldDisplayNeverTranslateInfoBarOnCancel() { ...@@ -158,10 +158,3 @@ bool TranslateInfoBar::ShouldDisplayNeverTranslateInfoBarOnCancel() {
translate::TranslateInfoBarDelegate* TranslateInfoBar::GetDelegate() { translate::TranslateInfoBarDelegate* TranslateInfoBar::GetDelegate() {
return delegate()->AsTranslateInfoBarDelegate(); return delegate()->AsTranslateInfoBarDelegate();
} }
// Native JNI methods ---------------------------------------------------------
bool RegisterTranslateInfoBarDelegate(JNIEnv* env) {
return RegisterNativesImpl(env);
}
...@@ -47,8 +47,4 @@ class TranslateInfoBar : public InfoBarAndroid { ...@@ -47,8 +47,4 @@ class TranslateInfoBar : public InfoBarAndroid {
DISALLOW_COPY_AND_ASSIGN(TranslateInfoBar); DISALLOW_COPY_AND_ASSIGN(TranslateInfoBar);
}; };
// Registers the native methods through JNI.
bool RegisterTranslateInfoBarDelegate(JNIEnv* env);
#endif // CHROME_BROWSER_UI_ANDROID_INFOBARS_TRANSLATE_INFOBAR_H_ #endif // CHROME_BROWSER_UI_ANDROID_INFOBARS_TRANSLATE_INFOBAR_H_
...@@ -162,12 +162,6 @@ ScopedJavaLocalRef<jobject> GetCurrentModalDialog( ...@@ -162,12 +162,6 @@ ScopedJavaLocalRef<jobject> GetCurrentModalDialog(
return ScopedJavaLocalRef<jobject>(js_dialog->GetDialogObject()); return ScopedJavaLocalRef<jobject>(js_dialog->GetDialogObject());
} }
// static
bool JavascriptAppModalDialogAndroid::RegisterJavascriptAppModalDialog(
JNIEnv* env) {
return RegisterNativesImpl(env);
}
JavascriptAppModalDialogAndroid::~JavascriptAppModalDialogAndroid() { JavascriptAppModalDialogAndroid::~JavascriptAppModalDialogAndroid() {
// In case the dialog is still displaying, tell it to close itself. // In case the dialog is still displaying, tell it to close itself.
// This can happen if you trigger a dialog but close the Tab before it's // This can happen if you trigger a dialog but close the Tab before it's
......
...@@ -45,8 +45,6 @@ class JavascriptAppModalDialogAndroid ...@@ -45,8 +45,6 @@ class JavascriptAppModalDialogAndroid
const base::android::ScopedJavaGlobalRef<jobject>& GetDialogObject() const; const base::android::ScopedJavaGlobalRef<jobject>& GetDialogObject() const;
static bool RegisterJavascriptAppModalDialog(JNIEnv* env);
private: private:
// The object deletes itself. // The object deletes itself.
~JavascriptAppModalDialogAndroid() override; ~JavascriptAppModalDialogAndroid() override;
......
...@@ -32,8 +32,3 @@ ScopedJavaLocalRef<jintArray> ParseForEmphasizeComponents( ...@@ -32,8 +32,3 @@ ScopedJavaLocalRef<jintArray> ParseForEmphasizeComponents(
int emphasize_values[] = {scheme.begin, scheme.len, host.begin, host.len}; int emphasize_values[] = {scheme.begin, scheme.len, host.begin, host.len};
return base::android::ToJavaIntArray(env, emphasize_values, 4); return base::android::ToJavaIntArray(env, emphasize_values, 4);
} }
// static
bool OmniboxUrlEmphasizer::RegisterOmniboxUrlEmphasizer(JNIEnv* env) {
return RegisterNativesImpl(env);
}
...@@ -11,9 +11,6 @@ ...@@ -11,9 +11,6 @@
// Helper functions for the Omnibox URL emphasizer on Android. // Helper functions for the Omnibox URL emphasizer on Android.
class OmniboxUrlEmphasizer { class OmniboxUrlEmphasizer {
public:
static bool RegisterOmniboxUrlEmphasizer(JNIEnv* env);
private: private:
DISALLOW_IMPLICIT_CONSTRUCTORS(OmniboxUrlEmphasizer); DISALLOW_IMPLICIT_CONSTRUCTORS(OmniboxUrlEmphasizer);
}; };
......
...@@ -21,8 +21,3 @@ ScopedJavaLocalRef<jstring> SanitizeTextForPaste( ...@@ -21,8 +21,3 @@ ScopedJavaLocalRef<jstring> SanitizeTextForPaste(
pasted_text = OmniboxView::SanitizeTextForPaste(pasted_text); pasted_text = OmniboxView::SanitizeTextForPaste(pasted_text);
return base::android::ConvertUTF16ToJavaString(env, pasted_text); return base::android::ConvertUTF16ToJavaString(env, pasted_text);
} }
// static
bool OmniboxViewUtil::RegisterOmniboxViewUtil(JNIEnv* env) {
return RegisterNativesImpl(env);
}
...@@ -11,9 +11,6 @@ ...@@ -11,9 +11,6 @@
// Helper functions for the Omnibox view on Android. // Helper functions for the Omnibox view on Android.
class OmniboxViewUtil { class OmniboxViewUtil {
public:
static bool RegisterOmniboxViewUtil(JNIEnv* env);
private: private:
DISALLOW_IMPLICIT_CONSTRUCTORS(OmniboxViewUtil); DISALLOW_IMPLICIT_CONSTRUCTORS(OmniboxViewUtil);
}; };
......
...@@ -2,8 +2,6 @@ ...@@ -2,8 +2,6 @@
// Use of this source code is governed by a BSD-style license that can be // Use of this source code is governed by a BSD-style license that can be
// found in the LICENSE file. // found in the LICENSE file.
#include "chrome/browser/ui/android/page_info/certificate_chain_helper.h"
#include "base/android/jni_android.h" #include "base/android/jni_android.h"
#include "base/android/jni_array.h" #include "base/android/jni_array.h"
#include "base/android/jni_string.h" #include "base/android/jni_string.h"
...@@ -50,8 +48,3 @@ static ScopedJavaLocalRef<jobjectArray> GetCertificateChain( ...@@ -50,8 +48,3 @@ static ScopedJavaLocalRef<jobjectArray> GetCertificateChain(
return base::android::ToJavaArrayOfByteArray(env, cert_chain); return base::android::ToJavaArrayOfByteArray(env, cert_chain);
} }
// static
bool RegisterCertificateChainHelper(JNIEnv* env) {
return RegisterNativesImpl(env);
}
// Copyright 2016 The Chromium Authors. All rights reserved.
// Use of this source code is governed by a BSD-style license that can be
// found in the LICENSE file.
#ifndef CHROME_BROWSER_UI_ANDROID_PAGE_INFO_CERTIFICATE_CHAIN_HELPER_H_
#define CHROME_BROWSER_UI_ANDROID_PAGE_INFO_CERTIFICATE_CHAIN_HELPER_H_
#include <jni.h>
bool RegisterCertificateChainHelper(JNIEnv* env);
#endif // CHROME_BROWSER_UI_ANDROID_PAGE_INFO_CERTIFICATE_CHAIN_HELPER_H_
...@@ -2,10 +2,9 @@ ...@@ -2,10 +2,9 @@
// Use of this source code is governed by a BSD-style license that can be // Use of this source code is governed by a BSD-style license that can be
// found in the LICENSE file. // found in the LICENSE file.
#include "chrome/browser/ui/android/page_info/certificate_viewer_android.h"
#include "base/android/jni_string.h" #include "base/android/jni_string.h"
#include "base/logging.h" #include "base/logging.h"
#include "chrome/browser/certificate_viewer.h"
#include "chrome/grit/generated_resources.h" #include "chrome/grit/generated_resources.h"
#include "jni/CertificateViewer_jni.h" #include "jni/CertificateViewer_jni.h"
#include "net/cert/x509_certificate.h" #include "net/cert/x509_certificate.h"
...@@ -105,7 +104,3 @@ static ScopedJavaLocalRef<jstring> GetCertSHA1FingerprintText( ...@@ -105,7 +104,3 @@ static ScopedJavaLocalRef<jstring> GetCertSHA1FingerprintText(
return ConvertUTF8ToJavaString( return ConvertUTF8ToJavaString(
env, l10n_util::GetStringUTF8(IDS_CERT_INFO_SHA1_FINGERPRINT_LABEL)); env, l10n_util::GetStringUTF8(IDS_CERT_INFO_SHA1_FINGERPRINT_LABEL));
} }
bool RegisterCertificateViewer(JNIEnv* env) {
return RegisterNativesImpl(env);
}
// Copyright 2015 The Chromium Authors. All rights reserved.
// Use of this source code is governed by a BSD-style license that can be
// found in the LICENSE file.
#ifndef CHROME_BROWSER_UI_ANDROID_PAGE_INFO_CERTIFICATE_VIEWER_ANDROID_H_
#define CHROME_BROWSER_UI_ANDROID_PAGE_INFO_CERTIFICATE_VIEWER_ANDROID_H_
#include "chrome/browser/certificate_viewer.h"
#include <jni.h>
bool RegisterCertificateViewer(JNIEnv* env);
#endif // CHROME_BROWSER_UI_ANDROID_PAGE_INFO_CERTIFICATE_VIEWER_ANDROID_H_
...@@ -153,10 +153,3 @@ void ConnectionInfoPopupAndroid::SetPermissionInfo( ...@@ -153,10 +153,3 @@ void ConnectionInfoPopupAndroid::SetPermissionInfo(
ChosenObjectInfoList chosen_object_info_list) { ChosenObjectInfoList chosen_object_info_list) {
NOTIMPLEMENTED(); NOTIMPLEMENTED();
} }
// static
bool
ConnectionInfoPopupAndroid::RegisterConnectionInfoPopupAndroid(
JNIEnv* env) {
return RegisterNativesImpl(env);
}
...@@ -40,8 +40,6 @@ class ConnectionInfoPopupAndroid : public PageInfoUI { ...@@ -40,8 +40,6 @@ class ConnectionInfoPopupAndroid : public PageInfoUI {
ChosenObjectInfoList chosen_object_info_list) override; ChosenObjectInfoList chosen_object_info_list) override;
void SetIdentityInfo(const IdentityInfo& identity_info) override; void SetIdentityInfo(const IdentityInfo& identity_info) override;
static bool RegisterConnectionInfoPopupAndroid(JNIEnv* env);
private: private:
// The presenter that controls the Page Info UI. // The presenter that controls the Page Info UI.
std::unique_ptr<PageInfo> presenter_; std::unique_ptr<PageInfo> presenter_;
......
...@@ -184,8 +184,3 @@ base::Optional<ContentSetting> PageInfoPopupAndroid::GetSettingToDisplay( ...@@ -184,8 +184,3 @@ base::Optional<ContentSetting> PageInfoPopupAndroid::GetSettingToDisplay(
} }
return base::Optional<ContentSetting>(); return base::Optional<ContentSetting>();
} }
// static
bool PageInfoPopupAndroid::RegisterPageInfoPopupAndroid(JNIEnv* env) {
return RegisterNativesImpl(env);
}
...@@ -49,8 +49,6 @@ class PageInfoPopupAndroid : public PageInfoUI { ...@@ -49,8 +49,6 @@ class PageInfoPopupAndroid : public PageInfoUI {
ChosenObjectInfoList chosen_object_info_list) override; ChosenObjectInfoList chosen_object_info_list) override;
void SetIdentityInfo(const IdentityInfo& identity_info) override; void SetIdentityInfo(const IdentityInfo& identity_info) override;
static bool RegisterPageInfoPopupAndroid(JNIEnv* env);
private: private:
// Returns an optional value which is set if this permission should be // Returns an optional value which is set if this permission should be
// displayed in Page Info. Most permissions will only be displayed if they are // displayed in Page Info. Most permissions will only be displayed if they are
......
...@@ -2,8 +2,6 @@ ...@@ -2,8 +2,6 @@
// Use of this source code is governed by a BSD-style license that can be // Use of this source code is governed by a BSD-style license that can be
// found in the LICENSE file. // found in the LICENSE file.
#include "chrome/browser/ui/android/ssl_client_certificate_request.h"
#include <stddef.h> #include <stddef.h>
#include <utility> #include <utility>
...@@ -178,10 +176,6 @@ static void NotifyClientCertificatesChangedOnIOThread( ...@@ -178,10 +176,6 @@ static void NotifyClientCertificatesChangedOnIOThread(
} }
} }
bool RegisterSSLClientCertificateRequestAndroid(JNIEnv* env) {
return RegisterNativesImpl(env);
}
} // namespace android } // namespace android
void ShowSSLClientCertificateSelector( void ShowSSLClientCertificateSelector(
......
// Copyright (c) 2013 The Chromium Authors. All rights reserved.
// Use of this source code is governed by a BSD-style license that can be
// found in the LICENSE file.
#ifndef CHROME_BROWSER_UI_ANDROID_SSL_CLIENT_CERTIFICATE_REQUEST_H_
#define CHROME_BROWSER_UI_ANDROID_SSL_CLIENT_CERTIFICATE_REQUEST_H_
#include <jni.h>
namespace chrome {
namespace android {
// Register JNI methods.
bool RegisterSSLClientCertificateRequestAndroid(JNIEnv* env);
} // namespace android
} // namespace chrome
#endif // CHROME_BROWSER_UI_ANDROID_SSL_CLIENT_CERTIFICATE_REQUEST_H_
...@@ -2,8 +2,6 @@ ...@@ -2,8 +2,6 @@
// Use of this source code is governed by a BSD-style license that can be // Use of this source code is governed by a BSD-style license that can be
// found in the LICENSE file. // found in the LICENSE file.
#include "chrome/browser/ui/android/tab_model/single_tab_model.h"
#include "base/android/jni_android.h" #include "base/android/jni_android.h"
#include "chrome/browser/android/tab_android.h" #include "chrome/browser/android/tab_android.h"
#include "chrome/browser/android/webapps/single_tab_mode_tab_helper.h" #include "chrome/browser/android/webapps/single_tab_mode_tab_helper.h"
...@@ -28,8 +26,3 @@ static void PermanentlyBlockAllNewWindows( ...@@ -28,8 +26,3 @@ static void PermanentlyBlockAllNewWindows(
SingleTabModeTabHelper::FromWebContents(web_contents); SingleTabModeTabHelper::FromWebContents(web_contents);
tab_helper->PermanentlyBlockAllNewWindows(); tab_helper->PermanentlyBlockAllNewWindows();
} }
// Register native methods
bool RegisterSingleTabModel(JNIEnv* env) {
return RegisterNativesImpl(env);
}
// Copyright 2015 The Chromium Authors. All rights reserved.
// Use of this source code is governed by a BSD-style license that can be
// found in the LICENSE file.
#ifndef CHROME_BROWSER_UI_ANDROID_TAB_MODEL_SINGLE_TAB_MODEL_H_
#define CHROME_BROWSER_UI_ANDROID_TAB_MODEL_SINGLE_TAB_MODEL_H_
#include "base/android/jni_android.h"
// Register native methods
bool RegisterSingleTabModel(JNIEnv* env);
#endif // CHROME_BROWSER_UI_ANDROID_TAB_MODEL_SINGLE_TAB_MODEL_H_
...@@ -210,10 +210,6 @@ TabModelJniBridge::~TabModelJniBridge() { ...@@ -210,10 +210,6 @@ TabModelJniBridge::~TabModelJniBridge() {
TabModelList::RemoveTabModel(this); TabModelList::RemoveTabModel(this);
} }
bool TabModelJniBridge::Register(JNIEnv* env) {
return RegisterNativesImpl(env);
}
static jlong Init(JNIEnv* env, static jlong Init(JNIEnv* env,
const JavaParamRef<jobject>& obj, const JavaParamRef<jobject>& obj,
jboolean is_incognito, jboolean is_incognito,
......
...@@ -33,9 +33,6 @@ class TabModelJniBridge : public TabModel { ...@@ -33,9 +33,6 @@ class TabModelJniBridge : public TabModel {
void Destroy(JNIEnv* env, const base::android::JavaParamRef<jobject>& obj); void Destroy(JNIEnv* env, const base::android::JavaParamRef<jobject>& obj);
~TabModelJniBridge() override; ~TabModelJniBridge() override;
// Registers the JNI bindings.
static bool Register(JNIEnv* env);
// Called by JNI // Called by JNI
base::android::ScopedJavaLocalRef<jobject> GetProfileAndroid( base::android::ScopedJavaLocalRef<jobject> GetProfileAndroid(
JNIEnv* env, JNIEnv* env,
......
...@@ -44,11 +44,6 @@ content::WebContents* ToolbarModelAndroid::GetActiveWebContents() const { ...@@ -44,11 +44,6 @@ content::WebContents* ToolbarModelAndroid::GetActiveWebContents() const {
return content::WebContents::FromJavaWebContents(jweb_contents); return content::WebContents::FromJavaWebContents(jweb_contents);
} }
// static
bool ToolbarModelAndroid::RegisterToolbarModelAndroid(JNIEnv* env) {
return RegisterNativesImpl(env);
}
// static // static
jlong Init(JNIEnv* env, jlong Init(JNIEnv* env,
const JavaParamRef<jobject>& obj, const JavaParamRef<jobject>& obj,
......
...@@ -32,8 +32,6 @@ class ToolbarModelAndroid : public ChromeToolbarModelDelegate { ...@@ -32,8 +32,6 @@ class ToolbarModelAndroid : public ChromeToolbarModelDelegate {
// ChromeToolbarModelDelegate: // ChromeToolbarModelDelegate:
content::WebContents* GetActiveWebContents() const override; content::WebContents* GetActiveWebContents() const override;
static bool RegisterToolbarModelAndroid(JNIEnv* env);
private: private:
std::unique_ptr<ToolbarModel> toolbar_model_; std::unique_ptr<ToolbarModel> toolbar_model_;
JavaObjectWeakGlobalRef weak_java_delegate_; JavaObjectWeakGlobalRef weak_java_delegate_;
......
...@@ -241,8 +241,3 @@ bool UsbChooserDialogAndroid::DisplayDevice( ...@@ -241,8 +241,3 @@ bool UsbChooserDialogAndroid::DisplayDevice(
return true; return true;
} }
// static
bool UsbChooserDialogAndroid::Register(JNIEnv* env) {
return RegisterNativesImpl(env);
}
...@@ -49,8 +49,6 @@ class UsbChooserDialogAndroid : public device::UsbService::Observer { ...@@ -49,8 +49,6 @@ class UsbChooserDialogAndroid : public device::UsbService::Observer {
void LoadUsbHelpPage(JNIEnv* env, void LoadUsbHelpPage(JNIEnv* env,
const base::android::JavaParamRef<jobject>& obj); const base::android::JavaParamRef<jobject>& obj);
static bool Register(JNIEnv* env);
private: private:
void GotUsbDeviceList( void GotUsbDeviceList(
const std::vector<scoped_refptr<device::UsbDevice>>& devices); const std::vector<scoped_refptr<device::UsbDevice>>& devices);
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment