Skip to content

Commit

Permalink
[Android] Remove AutofillPopupViewAndroid and AutofillPopupBridge.
Browse files Browse the repository at this point in the history
AutofillPopup is referenced in the following places:
* AwAutofillClient in /android_webview
* AutofillPopupBridge in /chrome/android
* AutofillProvider in /components/android_autofill
* AutofillUnitTest in /chrome/android [test-only]

This CL removes obsolete AutofillPopupViewAndroid implementation
of the AutofillPopupView. Only AutofillKeyboardAccessoryAdapter is
used on Android right now. AutofillPopupBridge is removed as a
dependency of the AutofillPopupViewAndroid.

This is done as part of the effort to move AutofillPopup to
android webview as it's the only place it's being used right now.

Bug: 1448820
Change-Id: I3bfc7f3090c5c75e2676516a769a60a45176ba00
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/4935178
Commit-Queue: Timofey Chudakov <tchudakov@google.com>
Reviewed-by: Vasilii Sukhanov <vasilii@chromium.org>
Reviewed-by: Friedrich Horschig <fhorschig@chromium.org>
Cr-Commit-Position: refs/heads/main@{#1209462}
  • Loading branch information
Timofey Chudakov authored and Chromium LUCI CQ committed Oct 13, 2023
1 parent 87d90d0 commit 7f04d23
Show file tree
Hide file tree
Showing 8 changed files with 14 additions and 610 deletions.
1 change: 0 additions & 1 deletion chrome/android/BUILD.gn
Original file line number Diff line number Diff line change
Expand Up @@ -3498,7 +3498,6 @@ generate_jni("chrome_jni_headers") {
"java/src/org/chromium/chrome/browser/autofill/AutofillExpirationDateFixFlowBridge.java",
"java/src/org/chromium/chrome/browser/autofill/AutofillLogger.java",
"java/src/org/chromium/chrome/browser/autofill/AutofillNameFixFlowBridge.java",
"java/src/org/chromium/chrome/browser/autofill/AutofillPopupBridge.java",
"java/src/org/chromium/chrome/browser/autofill/AutofillSaveCardBottomSheetBridge.java",
"java/src/org/chromium/chrome/browser/autofill/AutofillSnackbarController.java",
"java/src/org/chromium/chrome/browser/autofill/CardUnmaskBridge.java",
Expand Down
1 change: 0 additions & 1 deletion chrome/android/chrome_java_sources.gni
Original file line number Diff line number Diff line change
Expand Up @@ -111,7 +111,6 @@ chrome_java_sources = [
"java/src/org/chromium/chrome/browser/autofill/AutofillLogger.java",
"java/src/org/chromium/chrome/browser/autofill/AutofillNameFixFlowBridge.java",
"java/src/org/chromium/chrome/browser/autofill/AutofillNameFixFlowPrompt.java",
"java/src/org/chromium/chrome/browser/autofill/AutofillPopupBridge.java",
"java/src/org/chromium/chrome/browser/autofill/AutofillSaveCardBottomSheetBridge.java",
"java/src/org/chromium/chrome/browser/autofill/AutofillSaveCardBottomSheetContent.java",
"java/src/org/chromium/chrome/browser/autofill/AutofillSaveCardBottomSheetCoordinator.java",
Expand Down
2 changes: 0 additions & 2 deletions chrome/android/java/src/PRESUBMIT.py
Original file line number Diff line number Diff line change
Expand Up @@ -80,7 +80,6 @@ def _CheckNotificationConstructors(input_api, output_api):
def _CheckAlertDialogBuilder(input_api, output_api):
# In general, preference and FRE related UIs are not relevant to VR mode.
files_to_skip = (
BROWSER_ROOT + 'autofill/AutofillPopupBridge.java',
BROWSER_ROOT + 'autofill/prefeditor/EditorDialog.java',
BROWSER_ROOT + 'browserservices/ClearDataDialogActivity.java',
BROWSER_ROOT + 'browsing_data/ConfirmImportantSitesDialogFragment.java',
Expand Down Expand Up @@ -145,7 +144,6 @@ def _CheckAlertDialogBuilder(input_api, output_api):

def _CheckCompatibleAlertDialogBuilder(input_api, output_api):
files_to_skip = (
BROWSER_ROOT + 'autofill/AutofillPopupBridge.java',
BROWSER_ROOT + 'autofill/keyboard_accessory/'
'AutofillKeyboardAccessoryBridge.java',
BROWSER_ROOT + 'dom_distiller/DistilledPagePrefsView.java',
Expand Down

This file was deleted.

2 changes: 0 additions & 2 deletions chrome/browser/ui/BUILD.gn
Original file line number Diff line number Diff line change
Expand Up @@ -776,8 +776,6 @@ static_library("ui") {
"android/autofill/autofill_keyboard_accessory_view.h",
"android/autofill/autofill_logger_android.cc",
"android/autofill/autofill_logger_android.h",
"android/autofill/autofill_popup_view_android.cc",
"android/autofill/autofill_popup_view_android.h",
"android/autofill/autofill_progress_dialog_view_android.cc",
"android/autofill/autofill_progress_dialog_view_android.h",
"android/autofill/autofill_save_card_bottom_sheet_bridge.cc",
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -159,4 +159,18 @@ void AutofillKeyboardAccessoryView::ViewDismissed(
controller_->ViewDestroyed();
}

// static
base::WeakPtr<AutofillPopupView> AutofillPopupView::Create(
base::WeakPtr<AutofillPopupController> controller) {
auto adapter = std::make_unique<AutofillKeyboardAccessoryAdapter>(controller);
auto accessory_view = std::make_unique<AutofillKeyboardAccessoryView>(
adapter->GetWeakPtrToAdapter());
if (!accessory_view->Initialize()) {
return nullptr; // Don't create an adapter without initialized view.
}

adapter->SetAccessoryView(std::move(accessory_view));
return adapter.release()->GetWeakPtr();
}

} // namespace autofill

0 comments on commit 7f04d23

Please sign in to comment.