Commit a1ceab7b authored by Nina Satragno's avatar Nina Satragno Committed by Commit Bot

[webauthn] Fix inline bio enrollment focus

Fix the inline biometric enrollment dialog button not getting focus by
default.

Fixed: 1097311
Change-Id: I58cf4492287b68cc7ce5bb3f6980e65d3caebd80
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2255101
Commit-Queue: Nina Satragno <nsatragno@chromium.org>
Commit-Queue: Martin Kreichgauer <martinkr@google.com>
Auto-Submit: Nina Satragno <nsatragno@chromium.org>
Reviewed-by: default avatarMartin Kreichgauer <martinkr@google.com>
Cr-Commit-Position: refs/heads/master@{#780480}
parent 5b909dec
...@@ -30,6 +30,10 @@ AuthenticatorBioEnrollmentSheetView::AuthenticatorBioEnrollmentSheetView( ...@@ -30,6 +30,10 @@ AuthenticatorBioEnrollmentSheetView::AuthenticatorBioEnrollmentSheetView(
AuthenticatorBioEnrollmentSheetView::~AuthenticatorBioEnrollmentSheetView() = AuthenticatorBioEnrollmentSheetView::~AuthenticatorBioEnrollmentSheetView() =
default; default;
views::View* AuthenticatorBioEnrollmentSheetView::GetInitiallyFocusedView() {
return nullptr;
}
std::unique_ptr<views::View> std::unique_ptr<views::View>
AuthenticatorBioEnrollmentSheetView::BuildStepSpecificContent() { AuthenticatorBioEnrollmentSheetView::BuildStepSpecificContent() {
auto* bio_model = static_cast<AuthenticatorBioEnrollmentSheetModel*>(model()); auto* bio_model = static_cast<AuthenticatorBioEnrollmentSheetModel*>(model());
......
...@@ -19,6 +19,9 @@ class AuthenticatorBioEnrollmentSheetView ...@@ -19,6 +19,9 @@ class AuthenticatorBioEnrollmentSheetView
std::unique_ptr<AuthenticatorBioEnrollmentSheetModel> sheet_model); std::unique_ptr<AuthenticatorBioEnrollmentSheetModel> sheet_model);
~AuthenticatorBioEnrollmentSheetView() override; ~AuthenticatorBioEnrollmentSheetView() override;
// AuthenticatorRequestSheetView:
views::View* GetInitiallyFocusedView() override;
private: private:
// AuthenticatorRequestSheetView: // AuthenticatorRequestSheetView:
std::unique_ptr<views::View> BuildStepSpecificContent() override; std::unique_ptr<views::View> BuildStepSpecificContent() override;
......
...@@ -72,7 +72,7 @@ class AuthenticatorRequestSheetView : public views::View, ...@@ -72,7 +72,7 @@ class AuthenticatorRequestSheetView : public views::View,
// Returns the control on this sheet that should initially have focus instead // Returns the control on this sheet that should initially have focus instead
// of the OK/Cancel buttons on the dialog; or returns nullptr if the regular // of the OK/Cancel buttons on the dialog; or returns nullptr if the regular
// dialog button should have focus. // dialog button should have focus.
views::View* GetInitiallyFocusedView(); virtual views::View* GetInitiallyFocusedView();
AuthenticatorRequestSheetModel* model() { return model_.get(); } AuthenticatorRequestSheetModel* model() { return model_.get(); }
......
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