Rename ParentAccessView to PinRequestView.

Same for ParentAccessWidget -> PinRequestWidget.
This CL is renaming + minor cleanups only and is not expected to change
behavior.

Bug: 1001288
Change-Id: I39881349d7f3bbb58029ab392cb572d14f986d30
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2051271
Commit-Queue: Fabian Sommer <fabiansommer@chromium.org>
Reviewed-by: Xiyuan Xia <xiyuan@chromium.org>
Cr-Commit-Position: refs/heads/master@{#741044}

ash/BUILD.gn

@@ -473,12 +473,12 @@ component("ash") {
     "login/ui/non_accessible_view.h",
     "login/ui/note_action_launch_button.cc",
     "login/ui/note_action_launch_button.h",
-    "login/ui/parent_access_view.cc",
-    "login/ui/parent_access_view.h",
-    "login/ui/parent_access_widget.cc",
-    "login/ui/parent_access_widget.h",
     "login/ui/pin_keyboard_animation.cc",
     "login/ui/pin_keyboard_animation.h",
+    "login/ui/pin_request_view.cc",
+    "login/ui/pin_request_view.h",
+    "login/ui/pin_request_widget.cc",
+    "login/ui/pin_request_widget.h",
     "login/ui/public_account_warning_dialog.cc",
     "login/ui/public_account_warning_dialog.h",
     "login/ui/scrollable_users_list_view.cc",
@@ -1810,7 +1810,7 @@ test("ash_unittests") {
     "login/ui/login_user_menu_view_unittest.cc",
     "login/ui/login_user_view_unittest.cc",
     "login/ui/note_action_launch_button_unittest.cc",
-    "login/ui/parent_access_view_unittest.cc",
+    "login/ui/pin_request_view_unittest.cc",
     "login/ui/views_utils_unittest.cc",
     "magnifier/docked_magnifier_controller_impl_unittest.cc",
     "magnifier/magnification_controller_unittest.cc",

ash/ash_strings.grd

@@ -1929,10 +1929,10 @@ This file contains the strings for ash.
       <message name="IDS_ASH_LOGIN_PARENT_ACCESS_GENERIC_DESCRIPTION" desc="Description shown on the parent access input dialog. Explains what code should be used to unlock the device.">
         Enter Family Link parent access code.
       </message>
-      <message name="IDS_ASH_LOGIN_PARENT_ACCESS_HELP" desc="Label of a button shown on the parent access input dialog.">
+      <message name="IDS_ASH_LOGIN_PIN_REQUEST_HELP" desc="Label of a button shown on the pin request input dialog.">
         Need help?
       </message>
-      <message name="IDS_ASH_LOGIN_PARENT_ACCESS_NEXT_NUMBER_PROMPT" desc="Accessible prompt read when next access code input field has been focused. Asks user to enter next piece of the access code.">
+      <message name="IDS_ASH_LOGIN_PIN_REQUEST_NEXT_NUMBER_PROMPT" desc="Accessible prompt read when next access code input field has been focused. Asks user to enter next piece of the access code.">
         Next number
       </message>
       <message name="IDS_ASH_LOGIN_SIGN_IN_REQUIRED_MESSAGE" desc="Message shown in the login screen when online sign-in is required.">

ash/login/login_screen_controller.cc

@@ -398,11 +398,11 @@ LoginScreenController::GetScopedGuestButtonBlocker() {
 
 void LoginScreenController::ShowParentAccessWidget(
     const AccountId& child_account_id,
-    ParentAccessRequest::OnParentAccessDone callback,
+    base::OnceCallback<void(bool success)> callback,
     ParentAccessRequestReason reason,
     bool extra_dimmer,
     base::Time validation_time) {
-  DCHECK(!ParentAccessWidget::Get());
+  DCHECK(!PinRequestWidget::Get());
   Shell::Get()->parent_access_controller()->ShowWidget(
       child_account_id, std::move(callback), reason, extra_dimmer,
       validation_time);

ash/login/parent_access_controller.cc

@@ -98,7 +98,7 @@ void RecordParentAccessUsage(ParentAccessRequestReason reason) {
   NOTREACHED() << "Unknown ParentAccessRequestReason";
 }
 
-ParentAccessView::SubmissionResult ParentAccessController::OnPinSubmitted(
+PinRequestView::SubmissionResult ParentAccessController::OnPinSubmitted(
     const std::string& pin) {
   bool pin_is_valid =
       Shell::Get()->login_screen_controller()->ValidateParentAccessCode(
@@ -108,16 +108,16 @@ ParentAccessView::SubmissionResult ParentAccessController::OnPinSubmitted(
     VLOG(1) << "Parent access code successfully validated";
     RecordParentAccessAction(
         ParentAccessController::UMAAction::kValidationSuccess);
-    return ParentAccessView::SubmissionResult::kPinAccepted;
+    return PinRequestView::SubmissionResult::kPinAccepted;
   }
 
   VLOG(1) << "Invalid parent access code entered";
   RecordParentAccessAction(ParentAccessController::UMAAction::kValidationError);
-  ParentAccessWidget::Get()->UpdateState(
-      ParentAccessRequestViewState::kError,
+  PinRequestWidget::Get()->UpdateState(
+      PinRequestViewState::kError,
       l10n_util::GetStringUTF16(IDS_ASH_LOGIN_PARENT_ACCESS_TITLE_ERROR),
       GetDescription(reason_));
-  return ParentAccessView::SubmissionResult::kPinError;
+  return PinRequestView::SubmissionResult::kPinError;
 }
 
 void ParentAccessController::OnBack() {
@@ -140,26 +140,26 @@ void ParentAccessController::OnHelp(gfx::NativeWindow parent_window) {
 
 bool ParentAccessController::ShowWidget(
     const AccountId& child_account_id,
-    ParentAccessRequest::OnParentAccessDone on_exit_callback,
+    PinRequest::OnPinRequestDone on_exit_callback,
     ParentAccessRequestReason reason,
     bool extra_dimmer,
     base::Time validation_time) {
-  if (ParentAccessWidget::Get())
+  if (PinRequestWidget::Get())
     return false;
 
   account_id_ = child_account_id;
   reason_ = reason;
   validation_time_ = validation_time;
-  ParentAccessRequest request;
-  request.on_parent_access_done = std::move(on_exit_callback);
+  PinRequest request;
+  request.on_pin_request_done = std::move(on_exit_callback);
   request.help_button_enabled = true;
   request.extra_dimmer = extra_dimmer;
   request.pin_length = kParentAccessCodePinLength;
   request.obscure_pin = false;
   request.title = GetTitle(reason);
   request.description = GetDescription(reason);
   request.accessible_title = GetAccessibleTitle();
-  ParentAccessWidget::Show(std::move(request), this);
+  PinRequestWidget::Show(std::move(request), this);
   RecordParentAccessUsage(reason);
   return true;
 }

ash/login/parent_access_controller.h

@@ -5,18 +5,16 @@
 #ifndef ASH_LOGIN_PARENT_ACCESS_CONTROLLER_H_
 #define ASH_LOGIN_PARENT_ACCESS_CONTROLLER_H_
 
-#include "ash/login/ui/parent_access_view.h"
-#include "ash/login/ui/parent_access_widget.h"
+#include "ash/login/ui/pin_request_view.h"
+#include "ash/login/ui/pin_request_widget.h"
 #include "ash/public/cpp/login_types.h"
 
 namespace ash {
 
-enum class ParentAccessRequestViewState;
-
 // ParentAccessController serves as a single point of access for PIN requests
 // regarding parent access. It takes care of showing and hiding the PIN UI, as
 // well as logging usage metrics.
-class ASH_EXPORT ParentAccessController : ParentAccessView::Delegate {
+class ASH_EXPORT ParentAccessController : PinRequestView::Delegate {
  public:
   // Actions that originated in parent access dialog. These values are persisted
   // to metrics. Entries should not be renumbered and numeric values should
@@ -53,13 +51,13 @@ class ASH_EXPORT ParentAccessController : ParentAccessView::Delegate {
   ParentAccessController& operator=(const ParentAccessController&) = delete;
   ~ParentAccessController() override;
 
-  // ParentAccessView::Delegate interface.
-  ParentAccessView::SubmissionResult OnPinSubmitted(
+  // PinRequestView::Delegate interface.
+  PinRequestView::SubmissionResult OnPinSubmitted(
       const std::string& pin) override;
   void OnBack() override;
   void OnHelp(gfx::NativeWindow parent_window) override;
 
-  // Shows a standalone ParentAccess dialog. If |child_account_id| is valid, it
+  // Shows a standalone parent access dialog. If |child_account_id| is valid, it
   // validates the parent access code for that child only, when it is empty it
   // validates the code for any child signed in the device.
   // |on_exit_callback| is invoked when the back button is clicked or the
@@ -78,7 +76,7 @@ class ASH_EXPORT ParentAccessController : ParentAccessView::Delegate {
   // Returns whether opening the dialog was successful. Will fail if another PIN
   // dialog is already opened.
   bool ShowWidget(const AccountId& child_account_id,
-                  ParentAccessRequest::OnParentAccessDone on_exit_callback,
+                  PinRequest::OnPinRequestDone on_exit_callback,
                   ParentAccessRequestReason reason,
                   bool extra_dimmer,
                   base::Time validation_time);

ash/login/parent_access_controller_unittest.cc

@@ -7,8 +7,8 @@
 #include "ash/login/mock_login_screen_client.h"
 #include "ash/login/ui/login_button.h"
 #include "ash/login/ui/login_test_base.h"
-#include "ash/login/ui/parent_access_view.h"
-#include "ash/login/ui/parent_access_widget.h"
+#include "ash/login/ui/pin_request_view.h"
+#include "ash/login/ui/pin_request_widget.h"
 #include "ash/login/ui/views_utils.h"
 #include "base/bind.h"
 #include "base/test/metrics/histogram_tester.h"
@@ -38,9 +38,9 @@ class ParentAccessControllerTest : public LoginTestBase {
     LoginTestBase::TearDown();
 
     // If the test did not explicitly dismissed the widget, destroy it now.
-    ParentAccessWidget* parent_access_widget = ParentAccessWidget::Get();
-    if (parent_access_widget)
-      parent_access_widget->Close(false /* validation success */);
+    PinRequestWidget* pin_request_widget = PinRequestWidget::Get();
+    if (pin_request_widget)
+      pin_request_widget->Close(false /* validation success */);
   }
 
   // Simulates mouse press event on a |button|.
@@ -63,8 +63,8 @@ class ParentAccessControllerTest : public LoginTestBase {
         base::BindRepeating(&ParentAccessControllerTest::OnFinished,
                             base::Unretained(this)),
         reason, false, validation_time_);
-    view_ = ParentAccessWidget::TestApi(ParentAccessWidget::Get())
-                .parent_access_view();
+    view_ =
+        PinRequestWidget::TestApi(PinRequestWidget::Get()).pin_request_view();
   }
 
   // Verifies expectation that UMA |action| was logged.
@@ -110,7 +110,7 @@ class ParentAccessControllerTest : public LoginTestBase {
 
   base::HistogramTester histogram_tester_;
 
-  ParentAccessView* view_ = nullptr;  // Owned by test widget view hierarchy.
+  PinRequestView* view_ = nullptr;  // Owned by test widget view hierarchy.
 
  private:
   DISALLOW_COPY_AND_ASSIGN(ParentAccessControllerTest);
@@ -119,18 +119,18 @@ class ParentAccessControllerTest : public LoginTestBase {
 // Tests parent access dialog showing/hiding and focus behavior for parent
 // access.
 TEST_F(ParentAccessControllerTest, ParentAccessDialogFocus) {
-  EXPECT_FALSE(ParentAccessWidget::Get());
+  EXPECT_FALSE(PinRequestWidget::Get());
 
   StartParentAccess();
-  ParentAccessView::TestApi view_test_api = ParentAccessView::TestApi(view_);
+  PinRequestView::TestApi view_test_api = PinRequestView::TestApi(view_);
 
-  ASSERT_TRUE(ParentAccessWidget::Get());
+  ASSERT_TRUE(PinRequestWidget::Get());
   EXPECT_TRUE(login_views_utils::HasFocusInAnyChildView(
       view_test_api.access_code_view()));
 
-  ParentAccessWidget::Get()->Close(false /* validation success */);
+  PinRequestWidget::Get()->Close(false /* validation success */);
 
-  EXPECT_FALSE(ParentAccessWidget::Get());
+  EXPECT_FALSE(PinRequestWidget::Get());
 }
 
 // Tests correct UMA reporting for parent access.
@@ -139,15 +139,15 @@ TEST_F(ParentAccessControllerTest, ParentAccessUMARecording) {
   histogram_tester_.ExpectBucketCount(
       ParentAccessController::kUMAParentAccessCodeUsage,
       ParentAccessController::UMAUsage::kTimeLimits, 1);
-  SimulateButtonPress(ParentAccessView::TestApi(view_).back_button());
+  SimulateButtonPress(PinRequestView::TestApi(view_).back_button());
   ExpectUMAActionReported(ParentAccessController::UMAAction::kCanceledByUser, 1,
                           1);
 
   StartParentAccess(ParentAccessRequestReason::kChangeTimezone);
   histogram_tester_.ExpectBucketCount(
       ParentAccessController::kUMAParentAccessCodeUsage,
       ParentAccessController::UMAUsage::kTimezoneChange, 1);
-  SimulateButtonPress(ParentAccessView::TestApi(view_).back_button());
+  SimulateButtonPress(PinRequestView::TestApi(view_).back_button());
   ExpectUMAActionReported(ParentAccessController::UMAAction::kCanceledByUser, 2,
                           2);
 
@@ -158,7 +158,7 @@ TEST_F(ParentAccessControllerTest, ParentAccessUMARecording) {
   histogram_tester_.ExpectBucketCount(
       ParentAccessController::kUMAParentAccessCodeUsage,
       ParentAccessController::UMAUsage::kTimeChangeInSession, 1);
-  SimulateButtonPress(ParentAccessView::TestApi(view_).back_button());
+  SimulateButtonPress(PinRequestView::TestApi(view_).back_button());
   ExpectUMAActionReported(ParentAccessController::UMAAction::kCanceledByUser, 3,
                           3);
 
@@ -168,7 +168,7 @@ TEST_F(ParentAccessControllerTest, ParentAccessUMARecording) {
   histogram_tester_.ExpectBucketCount(
       ParentAccessController::kUMAParentAccessCodeUsage,
       ParentAccessController::UMAUsage::kTimeChangeLoginScreen, 1);
-  SimulateButtonPress(ParentAccessView::TestApi(view_).back_button());
+  SimulateButtonPress(PinRequestView::TestApi(view_).back_button());
   ExpectUMAActionReported(ParentAccessController::UMAAction::kCanceledByUser, 4,
                           4);
 
@@ -178,7 +178,7 @@ TEST_F(ParentAccessControllerTest, ParentAccessUMARecording) {
   histogram_tester_.ExpectBucketCount(
       ParentAccessController::kUMAParentAccessCodeUsage,
       ParentAccessController::UMAUsage::kTimeChangeInSession, 2);
-  SimulateButtonPress(ParentAccessView::TestApi(view_).back_button());
+  SimulateButtonPress(PinRequestView::TestApi(view_).back_button());
   ExpectUMAActionReported(ParentAccessController::UMAAction::kCanceledByUser, 5,
                           5);
 
@@ -207,10 +207,10 @@ TEST_F(ParentAccessControllerTest, ParentAccessUnsuccessfulValidation) {
                           1, 1);
 
   EXPECT_CALL(*login_client_, ShowParentAccessHelpApp(_)).Times(1);
-  SimulateButtonPress(ParentAccessView::TestApi(view_).help_button());
+  SimulateButtonPress(PinRequestView::TestApi(view_).help_button());
   ExpectUMAActionReported(ParentAccessController::UMAAction::kGetHelp, 1, 2);
 
-  SimulateButtonPress(ParentAccessView::TestApi(view_).back_button());
+  SimulateButtonPress(PinRequestView::TestApi(view_).back_button());
   ExpectUMAActionReported(ParentAccessController::UMAAction::kCanceledByUser, 1,
                           3);
 }

ash/login/ui/lock_contents_view_unittest.cc

@@ -2152,7 +2152,7 @@ TEST_F(LockContentsViewUnitTest, ParentAccessDialog) {
       LoginAuthUserView::TestApi(primary_view->auth_user());
 
   EXPECT_TRUE(primary_view->auth_user());
-  EXPECT_FALSE(ParentAccessWidget::Get());
+  EXPECT_FALSE(PinRequestWidget::Get());
   EXPECT_TRUE(LoginPasswordView::TestApi(auth_user.password_view())
                   .textfield()
                   ->HasFocus());
@@ -2164,7 +2164,7 @@ TEST_F(LockContentsViewUnitTest, ParentAccessDialog) {
                    .textfield()
                    ->HasFocus());
 
-  ParentAccessWidget::Get()->Close(false /* validation success */);
+  PinRequestWidget::Get()->Close(false /* validation success */);
 
   EXPECT_TRUE(primary_view->auth_user());
   EXPECT_TRUE(LoginPasswordView::TestApi(auth_user.password_view())
@@ -2193,21 +2193,21 @@ TEST_F(LockContentsViewUnitTest, ParentAccessButton) {
   // Validation failed - show the button.
   contents->ShowParentAccessDialog();
   EXPECT_FALSE(LoginScreenTestApi::IsParentAccessButtonShown());
-  ParentAccessWidget::Get()->Close(false /* validation success */);
+  PinRequestWidget::Get()->Close(false /* validation success */);
   EXPECT_TRUE(LoginScreenTestApi::IsParentAccessButtonShown());
 
   // Validation succeeded - hide the button.
   contents->ShowParentAccessDialog();
   EXPECT_FALSE(LoginScreenTestApi::IsParentAccessButtonShown());
-  ParentAccessWidget::Get()->Close(true /* validation success */);
+  PinRequestWidget::Get()->Close(true /* validation success */);
   EXPECT_FALSE(LoginScreenTestApi::IsParentAccessButtonShown());
 
   // Validation failed but user auth got enabled - hide button.
   // (Device got unlocked when parent access dialog was shown)
   contents->ShowParentAccessDialog();
   EXPECT_FALSE(LoginScreenTestApi::IsParentAccessButtonShown());
   DataDispatcher()->EnableAuthForUser(child_id);
-  ParentAccessWidget::Get()->Close(false /* validation success */);
+  PinRequestWidget::Get()->Close(false /* validation success */);
   EXPECT_FALSE(LoginScreenTestApi::IsParentAccessButtonShown());
 }
 

ash/login/ui/login_auth_user_view.cc

@@ -18,8 +18,8 @@
 #include "ash/login/ui/login_pin_view.h"
 #include "ash/login/ui/login_user_view.h"
 #include "ash/login/ui/non_accessible_view.h"
-#include "ash/login/ui/parent_access_view.h"
 #include "ash/login/ui/pin_keyboard_animation.h"
+#include "ash/login/ui/pin_request_view.h"
 #include "ash/login/ui/system_label_button.h"
 #include "ash/login/ui/views_utils.h"
 #include "ash/public/cpp/login_constants.h"
@@ -664,7 +664,7 @@ class LoginAuthUserView::DisabledAuthMessageView : public views::View {
     cc::PaintFlags flags;
     flags.setStyle(cc::PaintFlags::kFill_Style);
     flags.setColor(
-        ParentAccessView::GetChildUserDialogColor(false /*using blur*/));
+        PinRequestView::GetChildUserDialogColor(false /*using blur*/));
     canvas->DrawRoundRect(GetContentsBounds(),
                           kDisabledAuthMessageRoundedCornerRadiusDp, flags);
   }