Update the parent access dialog title on timezone settings

Bug: 921145
Change-Id: I4bce60e976e9acaaff36597e2d50f87faefc0f39
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/1678576
Commit-Queue: Henrique Grandinetti <hgrandinetti@chromium.org>
Reviewed-by: Scott Violet <sky@chromium.org>
Cr-Commit-Position: refs/heads/master@{#672570}

ash/login/ui/parent_access_view.cc

@@ -112,6 +112,9 @@ base::string16 GetTitle(ParentAccessRequestReason reason) {
     case ParentAccessRequestReason::kChangeTime:
       title_id = IDS_ASH_LOGIN_PARENT_ACCESS_TITLE_CHANGE_TIME;
       break;
+    case ParentAccessRequestReason::kChangeTimezone:
+      title_id = IDS_ASH_LOGIN_PARENT_ACCESS_TITLE_CHANGE_TIMEZONE;
+      break;
   }
   return l10n_util::GetStringUTF16(title_id);
 }
@@ -123,6 +126,7 @@ base::string16 GetDescription(ParentAccessRequestReason reason) {
       description_id = IDS_ASH_LOGIN_PARENT_ACCESS_DESCRIPTION;
       break;
     case ParentAccessRequestReason::kChangeTime:
+    case ParentAccessRequestReason::kChangeTimezone:
       description_id = IDS_ASH_LOGIN_PARENT_ACCESS_GENERIC_DESCRIPTION;
       break;
   }

ash/login/ui/parent_access_view_unittest.cc

@@ -21,6 +21,7 @@
 #include "base/optional.h"
 #include "base/test/bind_test_util.h"
 #include "components/account_id/account_id.h"
+#include "testing/gtest/include/gtest/gtest.h"
 #include "ui/base/l10n/l10n_util.h"
 #include "ui/events/base_event_utils.h"
 #include "ui/events/event.h"
@@ -33,6 +34,27 @@ namespace ash {
 
 namespace {
 
+// Struct containing the correct title and description that are displayed when
+// the dialog is instantiated with a given ParentAccessRequestReason.
+struct ViewModifiersTestData {
+  ParentAccessRequestReason reason;
+  // The title string id.
+  int title;
+  // The description string id.
+  int description;
+};
+
+const ViewModifiersTestData kViewModifiersTestData[] = {
+    {ParentAccessRequestReason::kUnlockTimeLimits,
+     IDS_ASH_LOGIN_PARENT_ACCESS_TITLE,
+     IDS_ASH_LOGIN_PARENT_ACCESS_DESCRIPTION},
+    {ParentAccessRequestReason::kChangeTime,
+     IDS_ASH_LOGIN_PARENT_ACCESS_TITLE_CHANGE_TIME,
+     IDS_ASH_LOGIN_PARENT_ACCESS_GENERIC_DESCRIPTION},
+    {ParentAccessRequestReason::kChangeTimezone,
+     IDS_ASH_LOGIN_PARENT_ACCESS_TITLE_CHANGE_TIMEZONE,
+     IDS_ASH_LOGIN_PARENT_ACCESS_GENERIC_DESCRIPTION}};
+
 class ParentAccessViewTest : public LoginTestBase {
  protected:
   ParentAccessViewTest()
@@ -89,31 +111,26 @@ class ParentAccessViewTest : public LoginTestBase {
   DISALLOW_COPY_AND_ASSIGN(ParentAccessViewTest);
 };
 
+class ParentAccessViewModifiersTest
+    : public ParentAccessViewTest,
+      public ::testing::WithParamInterface<ViewModifiersTestData> {};
+
 }  // namespace
 
-// Tests that title and description are correctly set when reason is unlock time
-// limits.
-TEST_F(ParentAccessViewTest, UnlockTimeLimitsStrings) {
-  StartView(ParentAccessRequestReason::kUnlockTimeLimits);
+// Tests that title and description are correctly set.
+TEST_P(ParentAccessViewModifiersTest, CheckStrings) {
+  const ViewModifiersTestData& test_data = GetParam();
+  StartView(test_data.reason);
   ParentAccessView::TestApi test_api(view_);
-  EXPECT_EQ(l10n_util::GetStringUTF16(IDS_ASH_LOGIN_PARENT_ACCESS_TITLE),
+  EXPECT_EQ(l10n_util::GetStringUTF16(test_data.title),
             test_api.title_label()->GetText());
-  EXPECT_EQ(l10n_util::GetStringUTF16(IDS_ASH_LOGIN_PARENT_ACCESS_DESCRIPTION),
+  EXPECT_EQ(l10n_util::GetStringUTF16(test_data.description),
             test_api.description_label()->GetText());
 }
 
-// Tests that title and description are correctly set when reason is change
-// time.
-TEST_F(ParentAccessViewTest, ChangeTimeStrings) {
-  StartView(ParentAccessRequestReason::kChangeTime);
-  ParentAccessView::TestApi test_api(view_);
-  EXPECT_EQ(
-      l10n_util::GetStringUTF16(IDS_ASH_LOGIN_PARENT_ACCESS_TITLE_CHANGE_TIME),
-      test_api.title_label()->GetText());
-  EXPECT_EQ(l10n_util::GetStringUTF16(
-                IDS_ASH_LOGIN_PARENT_ACCESS_GENERIC_DESCRIPTION),
-            test_api.description_label()->GetText());
-}
+INSTANTIATE_TEST_SUITE_P(,
+                         ParentAccessViewModifiersTest,
+                         testing::ValuesIn(kViewModifiersTestData));
 
 // Tests that back button works.
 TEST_F(ParentAccessViewTest, BackButton) {

ash/public/cpp/login_types.h

@@ -292,8 +292,10 @@ struct ASH_PUBLIC_EXPORT AuthDisabledData {
 enum class ParentAccessRequestReason {
   // Unlock a Chromebook that is locked due to a Time Limit policy.
   kUnlockTimeLimits,
-  // Change time or timezone of the Chromebook.
+  // Update values on the date time dialog.
   kChangeTime,
+  // Update values on the timezone settings page.
+  kChangeTimezone,
 };
 
 }  // namespace ash

chrome/browser/ui/webui/settings/chromeos/date_time_handler.cc

@@ -165,7 +165,7 @@ void DateTimeHandler::HandleShowParentAccessForTimeZone(
       user_manager::UserManager::Get()->GetActiveUser()->GetAccountId(),
       base::BindRepeating(&DateTimeHandler::OnParentAccessValidation,
                           weak_ptr_factory_.GetWeakPtr()),
-      ash::ParentAccessRequestReason::kChangeTime);
+      ash::ParentAccessRequestReason::kChangeTimezone);
 }
 
 void DateTimeHandler::OnParentAccessValidation(bool success) {