Commit aba41ee2 authored by Fabian Sommer's avatar Fabian Sommer Committed by Commit Bot

Update Pin Request Dialog to current specs.

This concerns the height of the dialog, the handling of multiline titles
and descriptions, and the space between back button and lock icon.

Fixed: 1059858
Change-Id: I182c2329417feb4d2a50e183115e5a8cb7211fc4
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2089684
Commit-Queue: Fabian Sommer <fabiansommer@chromium.org>
Reviewed-by: default avatarDenis Kuznetsov [CET] <antrim@chromium.org>
Reviewed-by: default avatarMaksim Ivanov <emaxx@chromium.org>
Cr-Commit-Position: refs/heads/master@{#749690}
parent 52161418
This diff is collapsed.
...@@ -33,7 +33,6 @@ namespace ash { ...@@ -33,7 +33,6 @@ namespace ash {
class ArrowButtonView; class ArrowButtonView;
class LoginButton; class LoginButton;
class LoginPinView; class LoginPinView;
class NonAccessibleView;
// State of the PinRequestView. // State of the PinRequestView.
enum class PinRequestViewState { enum class PinRequestViewState {
...@@ -190,8 +189,7 @@ class ASH_EXPORT PinRequestView : public views::DialogDelegateView, ...@@ -190,8 +189,7 @@ class ASH_EXPORT PinRequestView : public views::DialogDelegateView,
// Returns if the pin keyboard should be visible. // Returns if the pin keyboard should be visible.
bool PinKeyboardVisible() const; bool PinKeyboardVisible() const;
// Sizes that depend on the pin keyboards visibility. // Size that depends on the pin keyboards visibility.
gfx::Size GetPinKeyboardToFooterSpacerSize() const;
gfx::Size GetPinRequestViewSize() const; gfx::Size GetPinRequestViewSize() const;
PinRequestViewState state_ = PinRequestViewState::kNormal; PinRequestViewState state_ = PinRequestViewState::kNormal;
...@@ -220,7 +218,6 @@ class ASH_EXPORT PinRequestView : public views::DialogDelegateView, ...@@ -220,7 +218,6 @@ class ASH_EXPORT PinRequestView : public views::DialogDelegateView,
LoginButton* back_button_ = nullptr; LoginButton* back_button_ = nullptr;
FocusableLabelButton* help_button_ = nullptr; FocusableLabelButton* help_button_ = nullptr;
ArrowButtonView* submit_button_ = nullptr; ArrowButtonView* submit_button_ = nullptr;
NonAccessibleView* pin_keyboard_to_footer_spacer_ = nullptr;
ScopedObserver<TabletModeController, TabletModeObserver> ScopedObserver<TabletModeController, TabletModeObserver>
tablet_mode_observer_{this}; tablet_mode_observer_{this};
......
...@@ -491,8 +491,8 @@ TEST_F(PinRequestWidgetTest, WidgetResizingInTabletMode) { ...@@ -491,8 +491,8 @@ TEST_F(PinRequestWidgetTest, WidgetResizingInTabletMode) {
ASSERT_TRUE(widget); ASSERT_TRUE(widget);
PinRequestView* view = PinRequestWidget::TestApi(widget).pin_request_view(); PinRequestView* view = PinRequestWidget::TestApi(widget).pin_request_view();
constexpr auto kClamshellModeSize = gfx::Size(340, 340); constexpr auto kClamshellModeSize = gfx::Size(340, 308);
constexpr auto kTabletModeSize = gfx::Size(340, 580); constexpr auto kTabletModeSize = gfx::Size(340, 532);
const auto widget_size = [&view]() -> gfx::Size { const auto widget_size = [&view]() -> gfx::Size {
return view->GetWidget()->GetWindowBoundsInScreen().size(); return view->GetWidget()->GetWindowBoundsInScreen().size();
......
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