forked from chromium/chromium
-
Notifications
You must be signed in to change notification settings - Fork 0
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
[Bluetooth] Add Passkey prompt dialog for bonding.
Add a Bluetooth PIN/Passkey dialog used for prompting the user during the bonding operation. Only used on platforms which do not automatically bond: Windows and Linux. Bug: 960258 Change-Id: I1948be1076bb4a3821791cc8eef080de3b7ac4ae Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2841104 Reviewed-by: Scott Violet <sky@chromium.org> Reviewed-by: John Abd-El-Malek <jam@chromium.org> Reviewed-by: Clark DuVall <cduvall@chromium.org> Reviewed-by: Reilly Grant <reillyg@chromium.org> Reviewed-by: Ravjit Singh Uppal <ravjit@chromium.org> Commit-Queue: Chris Mumford <cmumford@google.com> Cr-Commit-Position: refs/heads/main@{#928399}
- Loading branch information
Showing
45 changed files
with
1,545 additions
and
329 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
1 change: 1 addition & 0 deletions
1
chrome/app/generated_resources_grd/IDS_BLUETOOTH_DEVICE_CREDENTIALS_LABEL.png.sha1
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1 @@ | ||
| 752279e3f4c6d9e32ba7c88ea5e94ce4d3a8acd4 |
1 change: 1 addition & 0 deletions
1
chrome/app/generated_resources_grd/IDS_BLUETOOTH_DEVICE_CREDENTIALS_TITLE.png.sha1
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1 @@ | ||
| 2978c1a64b5ab43841d322f97b4f1d50e0851e64 |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
203 changes: 203 additions & 0 deletions
203
chrome/browser/ui/views/bluetooth_device_credentials_view.cc
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,203 @@ | ||
| // Copyright 2021 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. | ||
|
|
||
| #include "chrome/browser/ui/views/bluetooth_device_credentials_view.h" | ||
|
|
||
| #include <cwctype> | ||
|
|
||
| #include "base/bind.h" | ||
| #include "base/callback_helpers.h" | ||
| #include "base/ranges/algorithm.h" | ||
| #include "chrome/browser/ui/browser_dialogs.h" | ||
| #include "chrome/browser/ui/views/chrome_layout_provider.h" | ||
| #include "chrome/grit/generated_resources.h" | ||
| #include "components/constrained_window/constrained_window_views.h" | ||
| #include "components/vector_icons/vector_icons.h" | ||
| #include "device/bluetooth/strings/grit/bluetooth_strings.h" | ||
| #include "ui/base/l10n/l10n_util.h" | ||
| #include "ui/base/metadata/metadata_impl_macros.h" | ||
| #include "ui/compositor/layer.h" | ||
| #include "ui/gfx/color_utils.h" | ||
| #include "ui/gfx/paint_vector_icon.h" | ||
| #include "ui/views/controls/image_view.h" | ||
| #include "ui/views/controls/label.h" | ||
| #include "ui/views/layout/flex_layout.h" | ||
|
|
||
| using content::BluetoothDelegate; | ||
|
|
||
| namespace chrome { | ||
|
|
||
| void ShowBluetoothDeviceCredentialsDialog( | ||
| content::WebContents* web_contents, | ||
| const std::u16string& device_identifier, | ||
| BluetoothDelegate::CredentialsCallback close_callback) { | ||
| // This dialog owns itself. DialogDelegateView will delete |dialog| instance. | ||
| auto* dialog = new BluetoothDeviceCredentialsView(device_identifier, | ||
| std::move(close_callback)); | ||
| constrained_window::ShowWebModalDialogViews(dialog, web_contents); | ||
| } | ||
|
|
||
| } // namespace chrome | ||
|
|
||
| namespace { | ||
|
|
||
| bool IsInputTextValid(const std::u16string& text) { | ||
| const size_t num_digits = | ||
| base::ranges::count_if(text, [](auto ch) { return std::iswdigit(ch); }); | ||
| // This dialog is currently only used to prompt for Bluetooth PINs which | ||
| // are always six digit numeric values as per the spec. This function could | ||
| // do a better job of validating input, but should also be accompanied by | ||
| // a better UI to help the user understand why the "OK" button is disabled | ||
| // when a seemingly valid PIN, which doesn't conform to the spec., has been | ||
| // input. | ||
| return num_digits > 0; | ||
| } | ||
|
|
||
| } // namespace | ||
|
|
||
| BluetoothDeviceCredentialsView::BluetoothDeviceCredentialsView( | ||
| const std::u16string& device_identifier, | ||
| BluetoothDelegate::CredentialsCallback close_callback) | ||
| : close_callback_(std::move(close_callback)) { | ||
| SetModalType(ui::MODAL_TYPE_CHILD); | ||
| set_margins(ChromeLayoutProvider::Get()->GetDialogInsetsForContentType( | ||
| views::DialogContentType::kText, views::DialogContentType::kText)); | ||
| SetAcceptCallback( | ||
| base::BindOnce(&BluetoothDeviceCredentialsView::OnDialogAccepted, | ||
| base::Unretained(this))); | ||
| auto canceled = [](BluetoothDeviceCredentialsView* dialog) { | ||
| std::move(dialog->close_callback_) | ||
| .Run(BluetoothDelegate::DeviceCredentialsPromptResult::kCancelled, u""); | ||
| }; | ||
| SetCancelCallback(base::BindOnce(canceled, base::Unretained(this))); | ||
| SetCloseCallback(base::BindOnce(canceled, base::Unretained(this))); | ||
| InitControls(device_identifier); | ||
|
|
||
| chrome::RecordDialogCreation( | ||
| chrome::DialogIdentifier::BLUETOOTH_DEVICE_CREDENTIALS); | ||
| } | ||
|
|
||
| BluetoothDeviceCredentialsView::~BluetoothDeviceCredentialsView() = default; | ||
|
|
||
| void BluetoothDeviceCredentialsView::InitControls( | ||
| const std::u16string& device_identifier) { | ||
| // | ||
| // Create the following layout: | ||
| // | ||
| // ┌───────────────┬─────────────────────────────────────────────┐ | ||
| // │ │ Device passkey │ | ||
| // │ ┌───────────┐ │ │ | ||
| // │ │ │ │ Please enter the passkey for <device name>: │ | ||
| // │ │ Bluetooth │ │ ┌────────────────────────────────────────┐ │ | ||
| // │ │ icon │ │ │ │ │ | ||
| // │ │ │ │ └────────────────────────────────────────┘ │ | ||
| // │ └───────────┘ │ ┌──────┐ ┌────────┐ │ | ||
| // │ │ │ OK │ │ Cancel │ │ | ||
| // │ │ └──────┘ └────────┘ │ | ||
| // └───────────────┴─────────────────────────────────────────────┘ | ||
| // | ||
|
|
||
| SetLayoutManager(std::make_unique<views::FlexLayout>()) | ||
| ->SetCrossAxisAlignment(views::LayoutAlignment::kCenter); | ||
|
|
||
| // The vertical space that must exist on the top and the bottom of the item | ||
| // to ensure the proper spacing is maintained between items when stacking | ||
| // vertically. | ||
| const int vertical_spacing = ChromeLayoutProvider::Get()->GetDistanceMetric( | ||
| DISTANCE_CONTROL_LIST_VERTICAL) / | ||
| 2; | ||
| constexpr int horizontal_spacing = 0; | ||
|
|
||
| constexpr int kIconSize = 48; // width and height. | ||
| auto icon_view = std::make_unique<views::ImageView>(); | ||
| icon_view->SetImage(gfx::CreateVectorIcon( | ||
| vector_icons::kBluetoothIcon, kIconSize, | ||
| color_utils::DeriveDefaultIconColor(gfx::kGoogleGrey700))); | ||
| icon_view_ = AddChildView(std::move(icon_view)); | ||
|
|
||
| auto contents_wrapper = std::make_unique<views::View>(); | ||
| contents_wrapper->SetProperty( | ||
| views::kMarginsKey, gfx::Insets(vertical_spacing, horizontal_spacing)); | ||
|
|
||
| contents_wrapper->SetLayoutManager(std::make_unique<views::FlexLayout>()) | ||
| ->SetOrientation(views::LayoutOrientation::kVertical) | ||
| .SetMainAxisAlignment(views::LayoutAlignment::kCenter); | ||
| contents_wrapper->SetProperty( | ||
| views::kFlexBehaviorKey, | ||
| views::FlexSpecification(views::MinimumFlexSizeRule::kScaleToZero, | ||
| views::MaximumFlexSizeRule::kUnbounded)); | ||
|
|
||
| views::Label* passkey_prompt_label_ptr = nullptr; | ||
| { | ||
| auto passkey_prompt_label = | ||
| std::make_unique<views::Label>(l10n_util::GetStringFUTF16( | ||
| IDS_BLUETOOTH_DEVICE_CREDENTIALS_LABEL, device_identifier)); | ||
| passkey_prompt_label_ptr = passkey_prompt_label.get(); | ||
| passkey_prompt_label->SetHorizontalAlignment(gfx::ALIGN_LEFT); | ||
| passkey_prompt_label->SetMultiLine(true); | ||
| contents_wrapper->AddChildView(std::move(passkey_prompt_label)); | ||
| } | ||
|
|
||
| { | ||
| constexpr int kDefaultTextfieldNumChars = 8; | ||
| constexpr int kMinimumTextfieldNumChars = 6; | ||
|
|
||
| passkey_text_ = | ||
| contents_wrapper->AddChildView(std::make_unique<views::Textfield>()); | ||
| passkey_text_->set_controller(this); | ||
| passkey_text_->SetDefaultWidthInChars(kDefaultTextfieldNumChars); | ||
| passkey_text_->SetMinimumWidthInChars(kMinimumTextfieldNumChars); | ||
| passkey_text_->SetTextInputType(ui::TEXT_INPUT_TYPE_TEXT); | ||
| passkey_text_->SetAssociatedLabel(passkey_prompt_label_ptr); | ||
| // TODO(cmumford): Windows Narrator says "no item in view". | ||
| } | ||
|
|
||
| contents_wrapper_ = AddChildView(std::move(contents_wrapper)); | ||
| } | ||
|
|
||
| views::View* BluetoothDeviceCredentialsView::GetInitiallyFocusedView() { | ||
| return passkey_text_; | ||
| } | ||
|
|
||
| gfx::Size BluetoothDeviceCredentialsView::CalculatePreferredSize() const { | ||
| constexpr int kDialogWidth = 360; | ||
| int height = | ||
| GetLayoutManager()->GetPreferredHeightForWidth(this, kDialogWidth); | ||
| return gfx::Size(kDialogWidth, height); | ||
| } | ||
|
|
||
| bool BluetoothDeviceCredentialsView::IsDialogButtonEnabled( | ||
| ui::DialogButton button) const { | ||
| if (button != ui::DIALOG_BUTTON_OK) | ||
| return true; // Only "OK" button is sensitized - all others are enabled. | ||
|
|
||
| return IsInputTextValid(passkey_text_->GetText()); | ||
| } | ||
|
|
||
| std::u16string BluetoothDeviceCredentialsView::GetWindowTitle() const { | ||
| return l10n_util::GetStringUTF16(IDS_BLUETOOTH_DEVICE_CREDENTIALS_TITLE); | ||
| } | ||
|
|
||
| void BluetoothDeviceCredentialsView::OnDialogAccepted() { | ||
| DCHECK(IsDialogButtonEnabled(ui::DIALOG_BUTTON_OK)); | ||
|
|
||
| std::u16string trimmed_input; | ||
| base::TrimWhitespace(passkey_text_->GetText(), base::TRIM_ALL, | ||
| &trimmed_input); | ||
|
|
||
| std::move(close_callback_) | ||
| .Run(BluetoothDelegate::DeviceCredentialsPromptResult::kSuccess, | ||
| std::move(trimmed_input)); | ||
| } | ||
|
|
||
| void BluetoothDeviceCredentialsView::ContentsChanged( | ||
| views::Textfield* sender, | ||
| const std::u16string& new_contents) { | ||
| DCHECK_EQ(sender, passkey_text_); | ||
| SetButtonEnabled(ui::DIALOG_BUTTON_OK, IsInputTextValid(new_contents)); | ||
| DialogModelChanged(); | ||
| } | ||
|
|
||
| BEGIN_METADATA(BluetoothDeviceCredentialsView, views::DialogDelegateView) | ||
| END_METADATA |
Oops, something went wrong.