Skip to content

GitLab

T
tangled
Commit 45ecbf7b authored by Fabio Tirelo's avatar Fabio Tirelo Committed by Commit Bot
Browse files
Options

[Mfill Android] Rename PasswordAccessory{ViewAndroid,Bridge} to ManualFilling{ViewAndroid,Bridge} 

Bug: 905669
Change-Id: Id22625bd314b2affe80aff481dd305bbaae20c03
Reviewed-on: https://chromium-review.googlesource.com/c/1342397
Commit-Queue: Fabio Tirelo <ftirelo@chromium.org>
Reviewed-by: default avatarFriedrich Horschig [CET] <fhorschig@chromium.org>
Reviewed-by: default avatarVasilii Sukhanov <vasilii@chromium.org>
Cr-Commit-Position: refs/heads/master@{#609864}
parent d687b286
Hide whitespace changes
Inline Side-by-side
Showing with 53 additions and 55 deletions
chrome/android/java/src/org/chromium/chrome/browser/autofill/keyboard_accessory/PasswordAccessoryBridge.java → chrome/android/java/src/org/chromium/chrome/browser/autofill/keyboard_accessory/ManualFillingBridge.java
View file @ 45ecbf7b
......@@ -21,7 +21,7 @@ import org.chromium.ui.base.WindowAndroid;
import java.util.ArrayList;
import java.util.List;
class PasswordAccessoryBridge {
class ManualFillingBridge {
private final KeyboardAccessoryData.PropertyProvider<Item[]> mItemProvider =
new KeyboardAccessoryData.PropertyProvider<>();
private final KeyboardAccessoryData.PropertyProvider<Action[]> mActionProvider =
......@@ -31,7 +31,7 @@ class PasswordAccessoryBridge {
private final ChromeActivity mActivity;
private long mNativeView;
private PasswordAccessoryBridge(long nativeView, WindowAndroid windowAndroid) {
private ManualFillingBridge(long nativeView, WindowAndroid windowAndroid) {
mNativeView = nativeView;
mActivity = (ChromeActivity) windowAndroid.getActivity().get();
mManualFillingCoordinator = mActivity.getManualFillingController();
......@@ -40,8 +40,8 @@ class PasswordAccessoryBridge {
}
@CalledByNative
private static PasswordAccessoryBridge create(long nativeView, WindowAndroid windowAndroid) {
return new PasswordAccessoryBridge(nativeView, windowAndroid);
private static ManualFillingBridge create(long nativeView, WindowAndroid windowAndroid) {
return new ManualFillingBridge(nativeView, windowAndroid);
}
@CalledByNative
......@@ -152,8 +152,10 @@ class PasswordAccessoryBridge {
mNativeView, item.isObfuscated(), item.getCaption());
};
}
// clang-format off
items.add(Item.createSuggestion(field.getDisplayText(), field.getA11yDescription(),
field.isObfuscated(), itemSelectedCallback, this::fetchFavicon));
// clang-format on
}
}
......@@ -177,11 +179,11 @@ class PasswordAccessoryBridge {
nativeOnFaviconRequested(mNativeView, desiredSize, faviconCallback);
}
private native void nativeOnFaviconRequested(long nativePasswordAccessoryViewAndroid,
private native void nativeOnFaviconRequested(long nativeManualFillingViewAndroid,
int desiredSizeInPx, Callback<Bitmap> faviconCallback);
private native void nativeOnFillingTriggered(
long nativePasswordAccessoryViewAndroid, boolean isObfuscated, String textToFill);
long nativeManualFillingViewAndroid, boolean isObfuscated, String textToFill);
private native void nativeOnOptionSelected(
long nativePasswordAccessoryViewAndroid, String selectedOption);
private native void nativeOnGenerationRequested(long nativePasswordAccessoryViewAndroid);
long nativeManualFillingViewAndroid, String selectedOption);
private native void nativeOnGenerationRequested(long nativeManualFillingViewAndroid);
}
\ No newline at end of file
chrome/android/java_sources.gni
View file @ 45ecbf7b
......@@ -119,7 +119,7 @@ chrome_java_sources = [
"java/src/org/chromium/chrome/browser/autofill/keyboard_accessory/ManualFillingCoordinator.java",
"java/src/org/chromium/chrome/browser/autofill/keyboard_accessory/KeyboardExtensionSizeManager.java",
"java/src/org/chromium/chrome/browser/autofill/keyboard_accessory/ManualFillingMediator.java",
"java/src/org/chromium/chrome/browser/autofill/keyboard_accessory/PasswordAccessoryBridge.java",
"java/src/org/chromium/chrome/browser/autofill/keyboard_accessory/ManualFillingBridge.java",
"java/src/org/chromium/chrome/browser/autofill/keyboard_accessory/PasswordAccessorySheetCoordinator.java",
"java/src/org/chromium/chrome/browser/autofill/keyboard_accessory/PasswordAccessorySheetMediator.java",
"java/src/org/chromium/chrome/browser/autofill/keyboard_accessory/PasswordAccessorySheetProperties.java",
......
chrome/browser/BUILD.gn
View file @ 45ecbf7b
......@@ -2300,8 +2300,8 @@ jumbo_split_static_library("browser") {
"android/oom_intervention/oom_intervention_tab_helper.h",
"android/partner_browser_customizations.cc",
"android/partner_browser_customizations.h",
"android/password_manager/password_accessory_view_android.cc",
"android/password_manager/password_accessory_view_android.h",
"android/password_manager/manual_filling_view_android.cc",
"android/password_manager/manual_filling_view_android.h",
"android/password_manager/password_generation_dialog_view_android.cc",
"android/password_manager/password_generation_dialog_view_android.h",
"android/password_ui_view_android.cc",
......@@ -4635,7 +4635,7 @@ if (is_android) {
"../android/java/src/org/chromium/chrome/browser/autofill/PasswordGenerationPopupBridge.java",
"../android/java/src/org/chromium/chrome/browser/autofill/PersonalDataManager.java",
"../android/java/src/org/chromium/chrome/browser/autofill/PhoneNumberUtil.java",
"../android/java/src/org/chromium/chrome/browser/autofill/keyboard_accessory/PasswordAccessoryBridge.java",
"../android/java/src/org/chromium/chrome/browser/autofill/keyboard_accessory/ManualFillingBridge.java",
"../android/java/src/org/chromium/chrome/browser/autofill_assistant/AutofillAssistantUiController.java",
"../android/java/src/org/chromium/chrome/browser/banners/AppBannerManager.java",
"../android/java/src/org/chromium/chrome/browser/banners/AppBannerUiDelegateAndroid.java",
......
chrome/browser/android/password_manager/password_accessory_view_android.cc → chrome/browser/android/password_manager/manual_filling_view_android.cc
View file @ 45ecbf7b
......@@ -2,7 +2,7 @@
// Use of this source code is governed by a BSD-style license that can be
// found in the LICENSE file.
#include "chrome/browser/android/password_manager/password_accessory_view_android.h"
#include "chrome/browser/android/password_manager/manual_filling_view_android.h"
#include <jni.h>
......@@ -15,7 +15,7 @@
#include "base/android/jni_string.h"
#include "chrome/browser/autofill/manual_filling_controller.h"
#include "components/autofill/core/browser/accessory_sheet_data.h"
#include "jni/PasswordAccessoryBridge_jni.h"
#include "jni/ManualFillingBridge_jni.h"
#include "ui/android/view_android.h"
#include "ui/android/window_android.h"
#include "ui/gfx/android/java_bitmap.h"
......@@ -33,15 +33,14 @@ ScopedJavaLocalRef<jobject> ConvertAccessorySheetDataToJavaObject(
JNIEnv* env,
const AccessorySheetData& data) {
ScopedJavaLocalRef<jobject> j_data =
Java_PasswordAccessoryBridge_createAccessorySheetData(
Java_ManualFillingBridge_createAccessorySheetData(
env, ConvertUTF16ToJavaString(env, data.title()));
for (const UserInfo& user_info : data.user_info_list()) {
ScopedJavaLocalRef<jobject> j_user_info =
Java_PasswordAccessoryBridge_addUserInfoToAccessorySheetData(env,
j_data);
Java_ManualFillingBridge_addUserInfoToAccessorySheetData(env, j_data);
for (const UserInfo::Field& field : user_info.fields()) {
Java_PasswordAccessoryBridge_addFieldToUserInfo(
Java_ManualFillingBridge_addFieldToUserInfo(
env, j_user_info, ConvertUTF16ToJavaString(env, field.display_text()),
ConvertUTF16ToJavaString(env, field.a11y_description()),
field.is_obfuscated(), field.selectable());
......@@ -49,7 +48,7 @@ ScopedJavaLocalRef<jobject> ConvertAccessorySheetDataToJavaObject(
}
for (const FooterCommand& footer_command : data.footer_commands()) {
Java_PasswordAccessoryBridge_addFooterCommandToAccessorySheetData(
Java_ManualFillingBridge_addFooterCommandToAccessorySheetData(
env, j_data,
ConvertUTF16ToJavaString(env, footer_command.display_text()));
}
......@@ -58,76 +57,76 @@ ScopedJavaLocalRef<jobject> ConvertAccessorySheetDataToJavaObject(
} // namespace
PasswordAccessoryViewAndroid::PasswordAccessoryViewAndroid(
ManualFillingViewAndroid::ManualFillingViewAndroid(
ManualFillingController* controller)
: controller_(controller) {
ui::ViewAndroid* view_android = controller_->container_view();
DCHECK(view_android);
java_object_.Reset(Java_PasswordAccessoryBridge_create(
java_object_.Reset(Java_ManualFillingBridge_create(
base::android::AttachCurrentThread(), reinterpret_cast<intptr_t>(this),
view_android->GetWindowAndroid()->GetJavaObject()));
}
PasswordAccessoryViewAndroid::~PasswordAccessoryViewAndroid() {
ManualFillingViewAndroid::~ManualFillingViewAndroid() {
DCHECK(!java_object_.is_null());
Java_PasswordAccessoryBridge_destroy(base::android::AttachCurrentThread(),
java_object_);
Java_ManualFillingBridge_destroy(base::android::AttachCurrentThread(),
java_object_);
java_object_.Reset(nullptr);
}
void PasswordAccessoryViewAndroid::OnItemsAvailable(
void ManualFillingViewAndroid::OnItemsAvailable(
const AccessorySheetData& data) {
DCHECK(!java_object_.is_null());
JNIEnv* env = base::android::AttachCurrentThread();
Java_PasswordAccessoryBridge_onItemsAvailable(
Java_ManualFillingBridge_onItemsAvailable(
env, java_object_, ConvertAccessorySheetDataToJavaObject(env, data));
}
void PasswordAccessoryViewAndroid::CloseAccessorySheet() {
Java_PasswordAccessoryBridge_closeAccessorySheet(
void ManualFillingViewAndroid::CloseAccessorySheet() {
Java_ManualFillingBridge_closeAccessorySheet(
base::android::AttachCurrentThread(), java_object_);
}
void PasswordAccessoryViewAndroid::SwapSheetWithKeyboard() {
Java_PasswordAccessoryBridge_swapSheetWithKeyboard(
void ManualFillingViewAndroid::SwapSheetWithKeyboard() {
Java_ManualFillingBridge_swapSheetWithKeyboard(
base::android::AttachCurrentThread(), java_object_);
}
void PasswordAccessoryViewAndroid::ShowWhenKeyboardIsVisible() {
Java_PasswordAccessoryBridge_showWhenKeyboardIsVisible(
void ManualFillingViewAndroid::ShowWhenKeyboardIsVisible() {
Java_ManualFillingBridge_showWhenKeyboardIsVisible(
base::android::AttachCurrentThread(), java_object_);
}
void PasswordAccessoryViewAndroid::Hide() {
Java_PasswordAccessoryBridge_hide(base::android::AttachCurrentThread(),
java_object_);
void ManualFillingViewAndroid::Hide() {
Java_ManualFillingBridge_hide(base::android::AttachCurrentThread(),
java_object_);
}
void PasswordAccessoryViewAndroid::OnAutomaticGenerationStatusChanged(
void ManualFillingViewAndroid::OnAutomaticGenerationStatusChanged(
bool available) {
if (!available && java_object_.is_null())
return;
JNIEnv* env = base::android::AttachCurrentThread();
Java_PasswordAccessoryBridge_onAutomaticGenerationStatusChanged(
env, java_object_, available);
Java_ManualFillingBridge_onAutomaticGenerationStatusChanged(env, java_object_,
available);
}
void PasswordAccessoryViewAndroid::OnFaviconRequested(
void ManualFillingViewAndroid::OnFaviconRequested(
JNIEnv* env,
const base::android::JavaParamRef<jobject>& obj,
jint desiredSizeInPx,
const base::android::JavaParamRef<jobject>& j_callback) {
controller_->GetFavicon(
desiredSizeInPx,
base::BindOnce(&PasswordAccessoryViewAndroid::OnImageFetched,
base::BindOnce(&ManualFillingViewAndroid::OnImageFetched,
base::Unretained(this), // Outlives or cancels request.
base::android::ScopedJavaGlobalRef<jobject>(j_callback)));
}
void PasswordAccessoryViewAndroid::OnFillingTriggered(
void ManualFillingViewAndroid::OnFillingTriggered(
JNIEnv* env,
const base::android::JavaParamRef<jobject>& obj,
jboolean isPassword,
......@@ -136,7 +135,7 @@ void PasswordAccessoryViewAndroid::OnFillingTriggered(
isPassword, base::android::ConvertJavaStringToUTF16(textToFill));
}
void PasswordAccessoryViewAndroid::OnOptionSelected(
void ManualFillingViewAndroid::OnOptionSelected(
JNIEnv* env,
const base::android::JavaParamRef<jobject>& obj,
const base::android::JavaParamRef<_jstring*>& selectedOption) {
......@@ -144,13 +143,13 @@ void PasswordAccessoryViewAndroid::OnOptionSelected(
base::android::ConvertJavaStringToUTF16(selectedOption));
}
void PasswordAccessoryViewAndroid::OnGenerationRequested(
void ManualFillingViewAndroid::OnGenerationRequested(
JNIEnv* env,
const base::android::JavaParamRef<jobject>& obj) {
controller_->OnGenerationRequested();
}
void PasswordAccessoryViewAndroid::OnImageFetched(
void ManualFillingViewAndroid::OnImageFetched(
const base::android::ScopedJavaGlobalRef<jobject>& j_callback,
const gfx::Image& image) {
base::android::ScopedJavaLocalRef<jobject> j_bitmap;
......@@ -163,5 +162,5 @@ void PasswordAccessoryViewAndroid::OnImageFetched(
// static
std::unique_ptr<ManualFillingViewInterface> ManualFillingViewInterface::Create(
ManualFillingController* controller) {
return std::make_unique<PasswordAccessoryViewAndroid>(controller);
return std::make_unique<ManualFillingViewAndroid>(controller);
}
chrome/browser/android/password_manager/password_accessory_view_android.h → chrome/browser/android/password_manager/manual_filling_view_android.h
View file @ 45ecbf7b
......@@ -2,8 +2,8 @@
// Use of this source code is governed by a BSD-style license that can be
// found in the LICENSE file.
#ifndef CHROME_BROWSER_ANDROID_PASSWORD_MANAGER_PASSWORD_ACCESSORY_VIEW_ANDROID_H_
#define CHROME_BROWSER_ANDROID_PASSWORD_MANAGER_PASSWORD_ACCESSORY_VIEW_ANDROID_H_
#ifndef CHROME_BROWSER_ANDROID_PASSWORD_MANAGER_MANUAL_FILLING_VIEW_ANDROID_H_
#define CHROME_BROWSER_ANDROID_PASSWORD_MANAGER_MANUAL_FILLING_VIEW_ANDROID_H_
#include <vector>
......@@ -19,14 +19,11 @@ class ManualFillingController;
// This Android-specific implementation of the |ManualFillingViewInterface|
// is the native counterpart of the |PasswordAccessoryViewBridge| java class.
// It's owned by a ManualFillingController which is bound to an activity.
//
// TODO(crbug.com/905669): Rename this to ManualFillingViewAndroid and
// PasswordAccessoryBridge to ManualFillingBridge.
class PasswordAccessoryViewAndroid : public ManualFillingViewInterface {
class ManualFillingViewAndroid : public ManualFillingViewInterface {
public:
// Builds the UI for the |controller|.
explicit PasswordAccessoryViewAndroid(ManualFillingController* controller);
~PasswordAccessoryViewAndroid() override;
explicit ManualFillingViewAndroid(ManualFillingController* controller);
~ManualFillingViewAndroid() override;
// ManualFillingViewInterface:
void OnItemsAvailable(const autofill::AccessorySheetData& data) override;
......@@ -65,7 +62,7 @@ class PasswordAccessoryViewAndroid : public ManualFillingViewInterface {
// The corresponding java object.
base::android::ScopedJavaGlobalRef<jobject> java_object_;
DISALLOW_COPY_AND_ASSIGN(PasswordAccessoryViewAndroid);
DISALLOW_COPY_AND_ASSIGN(ManualFillingViewAndroid);
};
#endif // CHROME_BROWSER_ANDROID_PASSWORD_MANAGER_PASSWORD_ACCESSORY_VIEW_ANDROID_H_
#endif // CHROME_BROWSER_ANDROID_PASSWORD_MANAGER_MANUAL_FILLING_VIEW_ANDROID_H_
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