diff --git a/chrome/browser/ash/child_accounts/parent_access_code/parent_access_service.h b/chrome/browser/ash/child_accounts/parent_access_code/parent_access_service.h
index 93b7c53d7fab00..cd467f5123e29d 100644
--- a/chrome/browser/ash/child_accounts/parent_access_code/parent_access_service.h
+++ b/chrome/browser/ash/child_accounts/parent_access_code/parent_access_service.h
@@ -11,8 +11,9 @@
 
 #include "base/macros.h"
 #include "base/no_destructor.h"
+#include "base/observer_list.h"
+#include "base/observer_list_types.h"
 #include "chrome/browser/ash/child_accounts/parent_access_code/config_source.h"
-#include "chrome/browser/ui/ash/login_screen_client.h"
 #include "components/account_id/account_id.h"
 
 class PrefRegistrySimple;
diff --git a/chrome/browser/ash/login/lock/screen_locker.cc b/chrome/browser/ash/login/lock/screen_locker.cc
index 7c9bd557e5bd5c..62a309ed90cfdb 100644
--- a/chrome/browser/ash/login/lock/screen_locker.cc
+++ b/chrome/browser/ash/login/lock/screen_locker.cc
@@ -46,7 +46,7 @@
 #include "chrome/browser/chrome_notification_types.h"
 #include "chrome/browser/lifetime/application_lifetime.h"
 #include "chrome/browser/profiles/profile.h"
-#include "chrome/browser/ui/ash/login_screen_client.h"
+#include "chrome/browser/ui/ash/login_screen_client_impl.h"
 #include "chrome/browser/ui/ash/session_controller_client_impl.h"
 #include "chrome/common/chrome_switches.h"
 #include "chrome/grit/browser_resources.h"
@@ -211,7 +211,7 @@ void ScreenLocker::Init() {
   delegate_ = views_screen_locker_.get();
 
   // Create and display lock screen.
-  CHECK(LoginScreenClient::HasInstance());
+  CHECK(LoginScreenClientImpl::HasInstance());
   ash::LoginScreen::Get()->ShowLockScreen();
   views_screen_locker_->Init();
 
@@ -804,7 +804,7 @@ void ScreenLocker::OnAuthScanDone(
     return;
   }
 
-  LoginScreenClient::Get()->auth_recorder()->RecordAuthMethod(
+  LoginScreenClientImpl::Get()->auth_recorder()->RecordAuthMethod(
       LoginAuthRecorder::AuthMethod::kFingerprint);
 
   if (scan_result != device::mojom::ScanResult::SUCCESS) {
diff --git a/chrome/browser/ash/login/lock/screen_locker_unittest.cc b/chrome/browser/ash/login/lock/screen_locker_unittest.cc
index 4c4c56cb50fb53..0a8800e66afaef 100644
--- a/chrome/browser/ash/login/lock/screen_locker_unittest.cc
+++ b/chrome/browser/ash/login/lock/screen_locker_unittest.cc
@@ -24,7 +24,7 @@
 #include "chrome/browser/chromeos/input_method/mock_input_method_manager_impl.h"
 #include "chrome/browser/ui/ash/accessibility/fake_accessibility_controller.h"
 #include "chrome/browser/ui/ash/assistant/assistant_client_impl.h"
-#include "chrome/browser/ui/ash/login_screen_client.h"
+#include "chrome/browser/ui/ash/login_screen_client_impl.h"
 #include "chrome/browser/ui/ash/session_controller_client_impl.h"
 #include "chrome/browser/ui/ash/test_login_screen.h"
 #include "chrome/browser/ui/ash/test_session_controller.h"
@@ -163,10 +163,10 @@ class ScreenLockerUnitTest : public testing::Test {
   // ScreenLocker dependencies:
   // * AccessibilityManager dependencies:
   FakeAccessibilityController fake_accessibility_controller_;
-  // * LoginScreenClient dependencies:
+  // * LoginScreenClientImpl dependencies:
   session_manager::SessionManager session_manager_;
   TestLoginScreen test_login_screen_;
-  LoginScreenClient login_screen_client_;
+  LoginScreenClientImpl login_screen_client_;
   // * SessionControllerClientImpl dependencies:
   FakeChromeUserManager* fake_user_manager_{new FakeChromeUserManager()};
   user_manager::ScopedUserManager scoped_user_manager_{
diff --git a/chrome/browser/ash/login/lock/views_screen_locker.cc b/chrome/browser/ash/login/lock/views_screen_locker.cc
index 79bfe860982c37..a0019005386090 100644
--- a/chrome/browser/ash/login/lock/views_screen_locker.cc
+++ b/chrome/browser/ash/login/lock/views_screen_locker.cc
@@ -45,7 +45,7 @@ namespace chromeos {
 ViewsScreenLocker::ViewsScreenLocker(ScreenLocker* screen_locker)
     : screen_locker_(screen_locker),
       system_info_updater_(std::make_unique<MojoSystemInfoDispatcher>()) {
-  LoginScreenClient::Get()->SetDelegate(this);
+  LoginScreenClientImpl::Get()->SetDelegate(this);
   user_board_view_mojo_ = std::make_unique<UserBoardViewMojo>();
   user_selection_screen_ =
       std::make_unique<ChromeUserSelectionScreen>(DisplayedScreen::LOCK_SCREEN);
@@ -54,7 +54,7 @@ ViewsScreenLocker::ViewsScreenLocker(ScreenLocker* screen_locker)
 
 ViewsScreenLocker::~ViewsScreenLocker() {
   lock_screen_apps::StateController::Get()->SetFocusCyclerDelegate(nullptr);
-  LoginScreenClient::Get()->SetDelegate(nullptr);
+  LoginScreenClientImpl::Get()->SetDelegate(nullptr);
 }
 
 void ViewsScreenLocker::Init() {
diff --git a/chrome/browser/ash/login/lock/views_screen_locker.h b/chrome/browser/ash/login/lock/views_screen_locker.h
index 3b50e69915119e..b91f01996c7426 100644
--- a/chrome/browser/ash/login/lock/views_screen_locker.h
+++ b/chrome/browser/ash/login/lock/views_screen_locker.h
@@ -10,7 +10,7 @@
 #include "base/time/time.h"
 #include "chrome/browser/ash/lock_screen_apps/focus_cycler_delegate.h"
 #include "chrome/browser/ash/login/lock/screen_locker.h"
-#include "chrome/browser/ui/ash/login_screen_client.h"
+#include "chrome/browser/ui/ash/login_screen_client_impl.h"
 #include "chromeos/dbus/power/power_manager_client.h"
 
 namespace chromeos {
@@ -19,11 +19,11 @@ class UserBoardViewMojo;
 class UserSelectionScreen;
 class MojoSystemInfoDispatcher;
 
-// ViewsScreenLocker acts like LoginScreenClient::Delegate which handles method
-// calls coming from ash into chrome.
+// ViewsScreenLocker acts like LoginScreenClientImpl::Delegate which handles
+// method calls coming from ash into chrome.
 // It is also a ScreenLocker::Delegate which handles calls from chrome into
 // ash (views-based lockscreen).
-class ViewsScreenLocker : public LoginScreenClient::Delegate,
+class ViewsScreenLocker : public LoginScreenClientImpl::Delegate,
                           public ScreenLocker::Delegate,
                           public PowerManagerClient::Observer,
                           public lock_screen_apps::FocusCyclerDelegate {
@@ -39,7 +39,7 @@ class ViewsScreenLocker : public LoginScreenClient::Delegate,
   void ClearErrors() override;
   void OnAshLockAnimationFinished() override;
 
-  // LoginScreenClient::Delegate
+  // LoginScreenClientImpl::Delegate
   void HandleAuthenticateUserWithPasswordOrPin(
       const AccountId& account_id,
       const std::string& password,
diff --git a/chrome/browser/ash/login/login_auth_recorder.h b/chrome/browser/ash/login/login_auth_recorder.h
index 7d230b612e5a0b..74d33b14e53f75 100644
--- a/chrome/browser/ash/login/login_auth_recorder.h
+++ b/chrome/browser/ash/login/login_auth_recorder.h
@@ -14,7 +14,7 @@ namespace chromeos {
 // A metrics recorder that records login authentication related metrics.
 // This keeps track of the last authentication method we used and records
 // switching between different authentication methods.
-// This is tied to LoginScreenClient lifetime.
+// This is tied to LoginScreenClientImpl lifetime.
 class LoginAuthRecorder : public session_manager::SessionManagerObserver {
  public:
   // Authentication method to unlock the screen. This enum is used to back an
diff --git a/chrome/browser/ash/login/login_auth_recorder_browsertest.cc b/chrome/browser/ash/login/login_auth_recorder_browsertest.cc
index ce0f32857afaf9..0b151ab14a1692 100644
--- a/chrome/browser/ash/login/login_auth_recorder_browsertest.cc
+++ b/chrome/browser/ash/login/login_auth_recorder_browsertest.cc
@@ -6,7 +6,7 @@
 
 #include "ash/public/cpp/test/shell_test_api.h"
 #include "base/test/metrics/histogram_tester.h"
-#include "chrome/browser/ui/ash/login_screen_client.h"
+#include "chrome/browser/ui/ash/login_screen_client_impl.h"
 #include "chrome/test/base/in_process_browser_test.h"
 #include "components/session_manager/core/session_manager.h"
 #include "content/public/test/browser_test.h"
@@ -41,7 +41,7 @@ class LoginAuthRecorderTest : public InProcessBrowserTest {
   }
 
   LoginAuthRecorder* metrics_recorder() {
-    return LoginScreenClient::Get()->auth_recorder();
+    return LoginScreenClientImpl::Get()->auth_recorder();
   }
 
   void SetAuthMethod(LoginAuthRecorder::AuthMethod auth_method) {
diff --git a/chrome/browser/ash/login/login_screen_policy_browsertest.cc b/chrome/browser/ash/login/login_screen_policy_browsertest.cc
index 15523723496011..5c98b107a2c6a8 100644
--- a/chrome/browser/ash/login/login_screen_policy_browsertest.cc
+++ b/chrome/browser/ash/login/login_screen_policy_browsertest.cc
@@ -25,7 +25,6 @@
 #include "chrome/browser/chrome_notification_types.h"
 #include "chrome/browser/chromeos/policy/device_policy_cros_browser_test.h"
 #include "chrome/browser/lifetime/application_lifetime.h"
-#include "chrome/browser/ui/ash/login_screen_client.h"
 #include "chrome/grit/generated_resources.h"
 #include "chrome/test/base/ui_test_utils.h"
 #include "chromeos/settings/cros_settings_names.h"
diff --git a/chrome/browser/ash/login/login_ui_keyboard_browsertest.cc b/chrome/browser/ash/login/login_ui_keyboard_browsertest.cc
index 8554f5e1ecb3ed..76b38fe03f8dff 100644
--- a/chrome/browser/ash/login/login_ui_keyboard_browsertest.cc
+++ b/chrome/browser/ash/login/login_ui_keyboard_browsertest.cc
@@ -27,7 +27,6 @@
 #include "chrome/browser/chromeos/input_method/input_method_persistence.h"
 #include "chrome/browser/chromeos/language_preferences.h"
 #include "chrome/browser/chromeos/policy/device_policy_cros_browser_test.h"
-#include "chrome/browser/ui/ash/login_screen_client.h"
 #include "chrome/browser/ui/ash/login_screen_shown_observer.h"
 #include "chrome/browser/ui/webui/chromeos/login/user_creation_screen_handler.h"
 #include "chrome/common/pref_names.h"
diff --git a/chrome/browser/ash/login/screens/user_selection_screen.cc b/chrome/browser/ash/login/screens/user_selection_screen.cc
index c06e4bb4b2a13d..02e222aea69c6e 100644
--- a/chrome/browser/ash/login/screens/user_selection_screen.cc
+++ b/chrome/browser/ash/login/screens/user_selection_screen.cc
@@ -41,7 +41,7 @@
 #include "chrome/browser/browser_process.h"
 #include "chrome/browser/browser_process_platform_part.h"
 #include "chrome/browser/chromeos/policy/browser_policy_connector_chromeos.h"
-#include "chrome/browser/ui/ash/login_screen_client.h"
+#include "chrome/browser/ui/ash/login_screen_client_impl.h"
 #include "chrome/browser/ui/webui/chromeos/login/l10n_util.h"
 #include "chrome/common/pref_names.h"
 #include "chrome/grit/generated_resources.h"
@@ -963,8 +963,8 @@ UserSelectionScreen::UpdateAndReturnUserListForAsh() {
     user_info.can_remove = CanRemoveUser(user);
 
     // Send a request to get keyboard layouts for default locale.
-    if (is_public_account && LoginScreenClient::HasInstance()) {
-      LoginScreenClient::Get()->RequestPublicSessionKeyboardLayouts(
+    if (is_public_account && LoginScreenClientImpl::HasInstance()) {
+      LoginScreenClientImpl::Get()->RequestPublicSessionKeyboardLayouts(
           account_id, user_info.public_account_info->default_locale);
     }
 
diff --git a/chrome/browser/ash/login/test/user_adding_screen_utils.cc b/chrome/browser/ash/login/test/user_adding_screen_utils.cc
index d29ce090c22e02..41597a0059d5a9 100644
--- a/chrome/browser/ash/login/test/user_adding_screen_utils.cc
+++ b/chrome/browser/ash/login/test/user_adding_screen_utils.cc
@@ -6,7 +6,7 @@
 
 #include "base/run_loop.h"
 #include "chrome/browser/ash/login/ui/user_adding_screen.h"
-#include "chrome/browser/ui/ash/login_screen_client.h"
+#include "chrome/browser/ui/ash/login_screen_client_impl.h"
 #include "chrome/browser/ui/ash/login_screen_shown_observer.h"
 
 namespace chromeos {
@@ -18,10 +18,10 @@ namespace {
 class LoginScreenWaiter : public LoginScreenShownObserver {
  public:
   LoginScreenWaiter() {
-    LoginScreenClient::Get()->AddLoginScreenShownObserver(this);
+    LoginScreenClientImpl::Get()->AddLoginScreenShownObserver(this);
   }
   ~LoginScreenWaiter() override {
-    LoginScreenClient::Get()->RemoveLoginScreenShownObserver(this);
+    LoginScreenClientImpl::Get()->RemoveLoginScreenShownObserver(this);
   }
   LoginScreenWaiter(const LoginScreenWaiter&) = delete;
   LoginScreenWaiter& operator=(const LoginScreenWaiter&) = delete;
diff --git a/chrome/browser/ash/login/ui/kiosk_app_menu_controller.cc b/chrome/browser/ash/login/ui/kiosk_app_menu_controller.cc
index 2e9666999199da..85cf2c9e87751e 100644
--- a/chrome/browser/ash/login/ui/kiosk_app_menu_controller.cc
+++ b/chrome/browser/ash/login/ui/kiosk_app_menu_controller.cc
@@ -17,7 +17,7 @@
 #include "chrome/browser/ash/app_mode/kiosk_app_types.h"
 #include "chrome/browser/ash/app_mode/web_app/web_kiosk_app_manager.h"
 #include "chrome/browser/ash/login/ui/login_display_host.h"
-#include "chrome/browser/ui/ash/login_screen_client.h"
+#include "chrome/browser/ui/ash/login_screen_client_impl.h"
 #include "extensions/grit/extensions_browser_resources.h"
 #include "ui/base/resource/resource_bundle.h"
 #include "ui/gfx/image/image_skia.h"
@@ -46,7 +46,7 @@ void KioskAppMenuController::OnKioskAppsSettingsChanged() {
 }
 
 void KioskAppMenuController::SendKioskApps() {
-  if (!LoginScreenClient::HasInstance())
+  if (!LoginScreenClientImpl::HasInstance())
     return;
 
   std::vector<ash::KioskAppMenuEntry> output;
diff --git a/chrome/browser/ash/login/ui/login_display_host_mojo.cc b/chrome/browser/ash/login/ui/login_display_host_mojo.cc
index e4167fd9d06f84..1fea2202b0166c 100644
--- a/chrome/browser/ash/login/ui/login_display_host_mojo.cc
+++ b/chrome/browser/ash/login/ui/login_display_host_mojo.cc
@@ -31,7 +31,7 @@
 #include "chrome/browser/ash/login/wizard_controller.h"
 #include "chrome/browser/ash/profiles/profile_helper.h"
 #include "chrome/browser/profiles/profile.h"
-#include "chrome/browser/ui/ash/login_screen_client.h"
+#include "chrome/browser/ui/ash/login_screen_client_impl.h"
 #include "chrome/browser/ui/ash/system_tray_client.h"
 #include "chrome/browser/ui/ash/wallpaper_controller_client_impl.h"
 #include "chrome/browser/ui/webui/chromeos/login/gaia_password_changed_screen_handler.h"
@@ -96,7 +96,7 @@ LoginDisplayHostMojo::~LoginDisplayHostMojo() {
         ->pin_dialog_manager()
         ->RemovePinDialogHost(&security_token_pin_dialog_host_ash_impl_);
   }
-  LoginScreenClient::Get()->SetDelegate(nullptr);
+  LoginScreenClientImpl::Get()->SetDelegate(nullptr);
   if (dialog_) {
     dialog_->GetOobeUI()->signin_screen_handler()->SetDelegate(nullptr);
     StopObservingOobeUI();
@@ -235,10 +235,10 @@ void LoginDisplayHostMojo::CancelUserAdding() {
 }
 
 void LoginDisplayHostMojo::OnStartSignInScreen() {
-  // This function may be called early in startup flow, before LoginScreenClient
-  // has been initialized. Wait until LoginScreenClient is initialized as it is
-  // a common dependency.
-  if (!LoginScreenClient::HasInstance()) {
+  // This function may be called early in startup flow, before
+  // LoginScreenClientImpl has been initialized. Wait until
+  // LoginScreenClientImpl is initialized as it is a common dependency.
+  if (!LoginScreenClientImpl::HasInstance()) {
     // TODO(jdufault): Add a timeout here / make sure we do not post infinitely.
     base::ThreadTaskRunnerHandle::Get()->PostTask(
         FROM_HERE, base::BindOnce(&LoginDisplayHostMojo::OnStartSignInScreen,
diff --git a/chrome/browser/ash/login/ui/login_display_host_mojo.h b/chrome/browser/ash/login/ui/login_display_host_mojo.h
index 9ee829ee255f36..fbcfad827d05c0 100644
--- a/chrome/browser/ash/login/ui/login_display_host_mojo.h
+++ b/chrome/browser/ash/login/ui/login_display_host_mojo.h
@@ -20,7 +20,7 @@
 #include "chrome/browser/ash/login/security_token_pin_dialog_host_ash_impl.h"
 #include "chrome/browser/ash/login/ui/login_display_host_common.h"
 #include "chrome/browser/ash/login/ui/oobe_ui_dialog_delegate.h"
-#include "chrome/browser/ui/ash/login_screen_client.h"
+#include "chrome/browser/ui/ash/login_screen_client_impl.h"
 #include "chrome/browser/ui/webui/chromeos/login/oobe_ui.h"
 #include "chromeos/login/auth/auth_status_consumer.h"
 #include "chromeos/login/auth/challenge_response_key.h"
@@ -43,7 +43,7 @@ class MojoSystemInfoDispatcher;
 // A LoginDisplayHost instance that sends requests to the views-based signin
 // screen.
 class LoginDisplayHostMojo : public LoginDisplayHostCommon,
-                             public LoginScreenClient::Delegate,
+                             public LoginScreenClientImpl::Delegate,
                              public AuthStatusConsumer,
                              public OobeUI::Observer,
                              public views::ViewObserver {
@@ -97,7 +97,7 @@ class LoginDisplayHostMojo : public LoginDisplayHostCommon,
   void AddObserver(LoginDisplayHost::Observer* observer) override;
   void RemoveObserver(LoginDisplayHost::Observer* observer) override;
 
-  // LoginScreenClient::Delegate:
+  // LoginScreenClientImpl::Delegate:
   void HandleAuthenticateUserWithPasswordOrPin(
       const AccountId& account_id,
       const std::string& password,
diff --git a/chrome/browser/ash/login/ui/login_display_mojo.cc b/chrome/browser/ash/login/ui/login_display_mojo.cc
index 271ff01689abf2..00bc89cb7f12fc 100644
--- a/chrome/browser/ash/login/ui/login_display_mojo.cc
+++ b/chrome/browser/ash/login/ui/login_display_mojo.cc
@@ -18,7 +18,7 @@
 #include "chrome/browser/ash/login/ui/login_display_host_mojo.h"
 #include "chrome/browser/browser_process.h"
 #include "chrome/browser/chrome_notification_types.h"
-#include "chrome/browser/ui/ash/login_screen_client.h"
+#include "chrome/browser/ui/ash/login_screen_client_impl.h"
 #include "chrome/browser/ui/webui/chromeos/login/enable_adb_sideloading_screen_handler.h"
 #include "chrome/browser/ui/webui/chromeos/login/enable_debugging_screen_handler.h"
 #include "chrome/browser/ui/webui/chromeos/login/kiosk_autolaunch_screen_handler.h"
@@ -64,7 +64,7 @@ void LoginDisplayMojo::Init(const user_manager::UserList& filtered_users,
                             bool show_users,
                             bool show_new_user) {
   host_->SetUserCount(filtered_users.size());
-  auto* client = LoginScreenClient::Get();
+  auto* client = LoginScreenClientImpl::Get();
 
   // ExistingUserController::DeviceSettingsChanged and others may initialize the
   // login screen multiple times. Views-login only supports initialization once.
diff --git a/chrome/browser/ash/login/ui/login_screen_extension_ui/web_dialog_view.cc b/chrome/browser/ash/login/ui/login_screen_extension_ui/web_dialog_view.cc
index dd7ce85144bf3f..4f9747b3854865 100644
--- a/chrome/browser/ash/login/ui/login_screen_extension_ui/web_dialog_view.cc
+++ b/chrome/browser/ash/login/ui/login_screen_extension_ui/web_dialog_view.cc
@@ -6,7 +6,7 @@
 
 #include "ash/public/cpp/login_screen.h"
 #include "chrome/browser/ash/login/ui/login_screen_extension_ui/dialog_delegate.h"
-#include "chrome/browser/ui/ash/login_screen_client.h"
+#include "chrome/browser/ui/ash/login_screen_client_impl.h"
 #include "content/public/browser/browser_context.h"
 #include "ui/views/metadata/metadata_impl_macros.h"
 
@@ -23,14 +23,14 @@ WebDialogView::WebDialogView(
       delegate_(delegate) {
   views::WidgetDelegate::SetShowTitle(!delegate_ ||
                                       delegate_->ShouldCenterDialogTitleText());
-  if (LoginScreenClient::HasInstance()) {
-    LoginScreenClient::Get()->AddSystemTrayObserver(this);
+  if (LoginScreenClientImpl::HasInstance()) {
+    LoginScreenClientImpl::Get()->AddSystemTrayObserver(this);
   }
 }
 
 WebDialogView::~WebDialogView() {
-  if (LoginScreenClient::HasInstance()) {
-    LoginScreenClient::Get()->RemoveSystemTrayObserver(this);
+  if (LoginScreenClientImpl::HasInstance()) {
+    LoginScreenClientImpl::Get()->RemoveSystemTrayObserver(this);
   }
 }
 
diff --git a/chrome/browser/ash/login/ui/oobe_ui_dialog_delegate.cc b/chrome/browser/ash/login/ui/oobe_ui_dialog_delegate.cc
index 02ec066d5f8b9a..0ed03b55aea462 100644
--- a/chrome/browser/ash/login/ui/oobe_ui_dialog_delegate.cc
+++ b/chrome/browser/ash/login/ui/oobe_ui_dialog_delegate.cc
@@ -309,13 +309,12 @@ void OobeUIDialogDelegate::SetShouldDisplayCaptivePortal(bool should_display) {
 }
 
 void OobeUIDialogDelegate::Show() {
-  if (LoginScreenClient::Get()) {
-    scoped_system_tray_observer_ = std::make_unique<
-        base::ScopedObservation<LoginScreenClient, ash::SystemTrayObserver,
-                                &LoginScreenClient::AddSystemTrayObserver,
-                                &LoginScreenClient::RemoveSystemTrayObserver>>(
-        this);
-    scoped_system_tray_observer_->Observe(LoginScreenClient::Get());
+  if (LoginScreenClientImpl::Get()) {
+    scoped_system_tray_observer_ = std::make_unique<base::ScopedObservation<
+        LoginScreenClientImpl, ash::SystemTrayObserver,
+        &LoginScreenClientImpl::AddSystemTrayObserver,
+        &LoginScreenClientImpl::RemoveSystemTrayObserver>>(this);
+    scoped_system_tray_observer_->Observe(LoginScreenClientImpl::Get());
   }
   widget_->Show();
   if (state_ == ash::OobeDialogState::HIDDEN) {
diff --git a/chrome/browser/ash/login/ui/oobe_ui_dialog_delegate.h b/chrome/browser/ash/login/ui/oobe_ui_dialog_delegate.h
index 0d98693b0e82b0..c64cae774d1474 100644
--- a/chrome/browser/ash/login/ui/oobe_ui_dialog_delegate.h
+++ b/chrome/browser/ash/login/ui/oobe_ui_dialog_delegate.h
@@ -15,7 +15,7 @@
 #include "base/scoped_observation.h"
 #include "chrome/browser/ash/login/screens/error_screen.h"
 #include "chrome/browser/ui/ash/keyboard/chrome_keyboard_controller_client.h"
-#include "chrome/browser/ui/ash/login_screen_client.h"
+#include "chrome/browser/ui/ash/login_screen_client_impl.h"
 #include "chrome/browser/ui/chrome_web_modal_dialog_manager_delegate.h"
 #include "chrome/browser/ui/webui/chromeos/login/oobe_ui.h"
 #include "components/web_modal/web_contents_modal_dialog_host.h"
@@ -154,10 +154,10 @@ class OobeUIDialogDelegate : public ui::WebDialogDelegate,
   base::ScopedObservation<OobeUI, OobeUI::Observer> oobe_ui_observer_{this};
 
   std::unique_ptr<
-      base::ScopedObservation<LoginScreenClient,
+      base::ScopedObservation<LoginScreenClientImpl,
                               ash::SystemTrayObserver,
-                              &LoginScreenClient::AddSystemTrayObserver,
-                              &LoginScreenClient::RemoveSystemTrayObserver>>
+                              &LoginScreenClientImpl::AddSystemTrayObserver,
+                              &LoginScreenClientImpl::RemoveSystemTrayObserver>>
       scoped_system_tray_observer_;
 
   std::map<ui::Accelerator, ash::LoginAcceleratorAction> accel_map_;
diff --git a/chrome/browser/ash/login/ui/user_adding_screen.cc b/chrome/browser/ash/login/ui/user_adding_screen.cc
index c64a32d23676c4..79280044f0d7ce 100644
--- a/chrome/browser/ash/login/ui/user_adding_screen.cc
+++ b/chrome/browser/ash/login/ui/user_adding_screen.cc
@@ -14,7 +14,7 @@
 #include "chrome/browser/ash/login/ui/login_display_host_mojo.h"
 #include "chrome/browser/ash/login/ui/login_display_host_webui.h"
 #include "chrome/browser/ash/login/ui/user_adding_screen_input_methods_controller.h"
-#include "chrome/browser/ui/ash/login_screen_client.h"
+#include "chrome/browser/ui/ash/login_screen_client_impl.h"
 #include "chrome/browser/ui/ash/wallpaper_controller_client_impl.h"
 #include "components/session_manager/core/session_manager.h"
 #include "components/user_manager/user_manager.h"
@@ -42,16 +42,16 @@ class UserAddingScreenImpl : public UserAddingScreen {
   class LoadTimeReporter : public LoginScreenShownObserver {
    public:
     LoadTimeReporter() : start_time_(base::TimeTicks::Now()) {
-      LoginScreenClient::Get()->AddLoginScreenShownObserver(this);
+      LoginScreenClientImpl::Get()->AddLoginScreenShownObserver(this);
     }
     LoadTimeReporter(const LoadTimeReporter&) = delete;
     LoadTimeReporter& operator=(const LoadTimeReporter&) = delete;
 
     ~LoadTimeReporter() override {
-      // In tests, LoginScreenClient's instance may be destroyed before
+      // In tests, LoginScreenClientImpl's instance may be destroyed before
       // LoadTimeReporterMojo's destructor is called.
-      if (LoginScreenClient::HasInstance())
-        LoginScreenClient::Get()->RemoveLoginScreenShownObserver(this);
+      if (LoginScreenClientImpl::HasInstance())
+        LoginScreenClientImpl::Get()->RemoveLoginScreenShownObserver(this);
     }
 
     // LoginScreenShownObserver:
@@ -59,7 +59,7 @@ class UserAddingScreenImpl : public UserAddingScreen {
       const base::TimeDelta load_time = base::TimeTicks::Now() - start_time_;
       UmaHistogramTimes("ChromeOS.UserAddingScreen.LoadTimeViewsBased",
                         load_time);
-      LoginScreenClient::Get()->RemoveLoginScreenShownObserver(this);
+      LoginScreenClientImpl::Get()->RemoveLoginScreenShownObserver(this);
     }
 
    private:
diff --git a/chrome/browser/ash/login/ui/user_adding_screen_browsertest.cc b/chrome/browser/ash/login/ui/user_adding_screen_browsertest.cc
index adfb64042620d4..1e210c31a2a03b 100644
--- a/chrome/browser/ash/login/ui/user_adding_screen_browsertest.cc
+++ b/chrome/browser/ash/login/ui/user_adding_screen_browsertest.cc
@@ -24,7 +24,6 @@
 #include "chrome/browser/ash/profiles/profile_helper.h"
 #include "chrome/browser/chrome_notification_types.h"
 #include "chrome/browser/profiles/profile.h"
-#include "chrome/browser/ui/ash/login_screen_client.h"
 #include "chrome/common/pref_names.h"
 #include "chrome/test/base/in_process_browser_test.h"
 #include "components/prefs/pref_service.h"
diff --git a/chrome/browser/ash/login/ui/webui_login_view.cc b/chrome/browser/ash/login/ui/webui_login_view.cc
index 817db54dccc9f3..950e6acca71a22 100644
--- a/chrome/browser/ash/login/ui/webui_login_view.cc
+++ b/chrome/browser/ash/login/ui/webui_login_view.cc
@@ -30,7 +30,7 @@
 #include "chrome/browser/renderer_preferences_util.h"
 #include "chrome/browser/sessions/session_tab_helper_factory.h"
 #include "chrome/browser/ui/ash/keyboard/chrome_keyboard_controller_client.h"
-#include "chrome/browser/ui/ash/login_screen_client.h"
+#include "chrome/browser/ui/ash/login_screen_client_impl.h"
 #include "chrome/browser/ui/ash/system_tray_client.h"
 #include "chrome/browser/ui/autofill/chrome_autofill_client.h"
 #include "chrome/browser/ui/webui/chromeos/login/oobe_ui.h"
@@ -122,8 +122,8 @@ WebUILoginView::WebUILoginView(const WebViewSettings& settings,
     AddAccelerator(i->first);
   }
 
-  if (LoginScreenClient::HasInstance()) {
-    LoginScreenClient::Get()->AddSystemTrayObserver(this);
+  if (LoginScreenClientImpl::HasInstance()) {
+    LoginScreenClientImpl::Get()->AddSystemTrayObserver(this);
     observing_system_tray_focus_ = true;
   }
 }
@@ -133,8 +133,8 @@ WebUILoginView::~WebUILoginView() {
     observer.OnHostDestroying();
 
   // TODO(crbug.com/1188526) - Improve the observation of the system tray
-  if (observing_system_tray_focus_ && LoginScreenClient::HasInstance())
-    LoginScreenClient::Get()->RemoveSystemTrayObserver(this);
+  if (observing_system_tray_focus_ && LoginScreenClientImpl::HasInstance())
+    LoginScreenClientImpl::Get()->RemoveSystemTrayObserver(this);
   ChromeKeyboardControllerClient::Get()->RemoveObserver(this);
 
   // Clear any delegates we have set on the WebView.
@@ -318,11 +318,11 @@ void WebUILoginView::Observe(int type,
       break;
     }
     case chrome::NOTIFICATION_APP_TERMINATING: {
-      // In some tests, WebUILoginView remains after LoginScreenClient gets
+      // In some tests, WebUILoginView remains after LoginScreenClientImpl gets
       // deleted on shutdown. It should unregister itself before the deletion
       // happens.
       if (observing_system_tray_focus_) {
-        LoginScreenClient::Get()->RemoveSystemTrayObserver(this);
+        LoginScreenClientImpl::Get()->RemoveSystemTrayObserver(this);
         observing_system_tray_focus_ = false;
       }
       break;
@@ -421,8 +421,8 @@ void WebUILoginView::OnSystemTrayBubbleShown() {
 }
 
 void WebUILoginView::OnLoginPromptVisible() {
-  if (!observing_system_tray_focus_ && LoginScreenClient::HasInstance()) {
-    LoginScreenClient::Get()->AddSystemTrayObserver(this);
+  if (!observing_system_tray_focus_ && LoginScreenClientImpl::HasInstance()) {
+    LoginScreenClientImpl::Get()->AddSystemTrayObserver(this);
     observing_system_tray_focus_ = true;
   }
   // If we're hidden than will generate this signal once we're shown.
diff --git a/chrome/browser/ash/login/user_board_view_mojo.cc b/chrome/browser/ash/login/user_board_view_mojo.cc
index af218204a160a2..f2834f144008b4 100644
--- a/chrome/browser/ash/login/user_board_view_mojo.cc
+++ b/chrome/browser/ash/login/user_board_view_mojo.cc
@@ -10,7 +10,7 @@
 #include "ash/public/cpp/login_screen_model.h"
 #include "ash/public/cpp/login_types.h"
 #include "chrome/browser/ash/login/lock_screen_utils.h"
-#include "chrome/browser/ui/ash/login_screen_client.h"
+#include "chrome/browser/ui/ash/login_screen_client_impl.h"
 
 namespace chromeos {
 
@@ -86,8 +86,8 @@ void UserBoardViewMojo::SetPublicSessionLocales(
       default_locale, multiple_recommended_locales);
 
   // Send a request to get keyboard layouts for `default_locale`.
-  LoginScreenClient::Get()->RequestPublicSessionKeyboardLayouts(account_id,
-                                                                default_locale);
+  LoginScreenClientImpl::Get()->RequestPublicSessionKeyboardLayouts(
+      account_id, default_locale);
 }
 
 void UserBoardViewMojo::SetPublicSessionShowFullManagementDisclosure(
diff --git a/chrome/browser/ash/login/wizard_controller.cc b/chrome/browser/ash/login/wizard_controller.cc
index 6714d0de3b8e14..bb6d6b244b0410 100644
--- a/chrome/browser/ash/login/wizard_controller.cc
+++ b/chrome/browser/ash/login/wizard_controller.cc
@@ -115,7 +115,6 @@
 #include "chrome/browser/policy/profile_policy_connector.h"
 #include "chrome/browser/profiles/profile.h"
 #include "chrome/browser/profiles/profile_manager.h"
-#include "chrome/browser/ui/ash/login_screen_client.h"
 #include "chrome/browser/ui/webui/chromeos/login/active_directory_login_screen_handler.h"
 #include "chrome/browser/ui/webui/chromeos/login/active_directory_password_change_screen_handler.h"
 #include "chrome/browser/ui/webui/chromeos/login/app_downloading_screen_handler.h"
diff --git a/chrome/browser/chromeos/extensions/login_screen/login_screen_ui/ui_handler.cc b/chrome/browser/chromeos/extensions/login_screen/login_screen_ui/ui_handler.cc
index 73d896d72bcd53..cc0a8f4121c04e 100644
--- a/chrome/browser/chromeos/extensions/login_screen/login_screen_ui/ui_handler.cc
+++ b/chrome/browser/chromeos/extensions/login_screen/login_screen_ui/ui_handler.cc
@@ -15,7 +15,6 @@
 #include "chrome/browser/ash/login/ui/login_screen_extension_ui/window.h"
 #include "chrome/browser/ash/profiles/profile_helper.h"
 #include "chrome/browser/profiles/profile.h"
-#include "chrome/browser/ui/ash/login_screen_client.h"
 #include "chromeos/tpm/install_attributes.h"
 #include "components/session_manager/core/session_manager.h"
 #include "content/public/browser/browser_thread.h"
diff --git a/chrome/browser/chromeos/input_method/input_method_persistence.cc b/chrome/browser/chromeos/input_method/input_method_persistence.cc
index 2b4e5840bacb77..f1ab9e12ca2886 100644
--- a/chrome/browser/chromeos/input_method/input_method_persistence.cc
+++ b/chrome/browser/chromeos/input_method/input_method_persistence.cc
@@ -14,7 +14,7 @@
 #include "chrome/browser/chromeos/language_preferences.h"
 #include "chrome/browser/profiles/profile.h"
 #include "chrome/browser/profiles/profile_manager.h"
-#include "chrome/browser/ui/ash/login_screen_client.h"
+#include "chrome/browser/ui/ash/login_screen_client_impl.h"
 #include "chrome/common/pref_names.h"
 #include "components/account_id/account_id.h"
 #include "components/prefs/pref_service.h"
@@ -112,7 +112,7 @@ void InputMethodPersistence::InputMethodChanged(InputMethodManager* manager,
       return;
     case InputMethodManager::UIStyle::kLock:
       // We are either in unit test, or screen should be locked.
-      DCHECK(!LoginScreenClient::HasInstance() ||
+      DCHECK(!LoginScreenClientImpl::HasInstance() ||
              ScreenLocker::default_screen_locker());
       return;
     case InputMethodManager::UIStyle::kSecondaryLogin:
diff --git a/chrome/browser/ui/BUILD.gn b/chrome/browser/ui/BUILD.gn
index 3eee024d5b8365..f085469af48bb4 100644
--- a/chrome/browser/ui/BUILD.gn
+++ b/chrome/browser/ui/BUILD.gn
@@ -2030,8 +2030,8 @@ static_library("ui") {
       "ash/launcher/shelf_spinner_controller.h",
       "ash/launcher/shelf_spinner_item_controller.cc",
       "ash/launcher/shelf_spinner_item_controller.h",
-      "ash/login_screen_client.cc",
-      "ash/login_screen_client.h",
+      "ash/login_screen_client_impl.cc",
+      "ash/login_screen_client_impl.h",
       "ash/login_screen_shown_observer.h",
       "ash/media_client_impl.cc",
       "ash/media_client_impl.h",
diff --git a/chrome/browser/ui/ash/chrome_browser_main_extra_parts_ash.cc b/chrome/browser/ui/ash/chrome_browser_main_extra_parts_ash.cc
index 73303575b331aa..3d83d0f8ae1a0e 100644
--- a/chrome/browser/ui/ash/chrome_browser_main_extra_parts_ash.cc
+++ b/chrome/browser/ui/ash/chrome_browser_main_extra_parts_ash.cc
@@ -37,7 +37,7 @@
 #include "chrome/browser/ui/ash/in_session_auth_dialog_client.h"
 #include "chrome/browser/ui/ash/launcher/app_service/exo_app_type_resolver.h"
 #include "chrome/browser/ui/ash/launcher/chrome_shelf_controller.h"
-#include "chrome/browser/ui/ash/login_screen_client.h"
+#include "chrome/browser/ui/ash/login_screen_client_impl.h"
 #include "chrome/browser/ui/ash/media_client_impl.h"
 #include "chrome/browser/ui/ash/media_notification_provider_impl.h"
 #include "chrome/browser/ui/ash/network/mobile_data_notifications.h"
@@ -208,8 +208,8 @@ void ChromeBrowserMainExtraPartsAsh::PreProfileInit() {
 }
 
 void ChromeBrowserMainExtraPartsAsh::PostProfileInit() {
-  login_screen_client_ = std::make_unique<LoginScreenClient>();
-  // https://crbug.com/884127 ensuring that LoginScreenClient is initialized
+  login_screen_client_ = std::make_unique<LoginScreenClientImpl>();
+  // https://crbug.com/884127 ensuring that LoginScreenClientImpl is initialized
   // before using it InitializeDeviceDisablingManager.
   g_browser_process->platform_part()->InitializeDeviceDisablingManager();
 
diff --git a/chrome/browser/ui/ash/chrome_browser_main_extra_parts_ash.h b/chrome/browser/ui/ash/chrome_browser_main_extra_parts_ash.h
index 21c946a6201f79..0db5b9a0ac9ea5 100644
--- a/chrome/browser/ui/ash/chrome_browser_main_extra_parts_ash.h
+++ b/chrome/browser/ui/ash/chrome_browser_main_extra_parts_ash.h
@@ -30,7 +30,7 @@ class AshShellInit;
 class CastConfigControllerMediaRouter;
 class ImeControllerClient;
 class InSessionAuthDialogClient;
-class LoginScreenClient;
+class LoginScreenClientImpl;
 class MediaClientImpl;
 class MobileDataNotifications;
 class NetworkConnectDelegateChromeOS;
@@ -109,7 +109,7 @@ class ChromeBrowserMainExtraPartsAsh : public ChromeBrowserMainExtraParts {
 #endif
 
   // Initialized in PostProfileInit in all configs:
-  std::unique_ptr<LoginScreenClient> login_screen_client_;
+  std::unique_ptr<LoginScreenClientImpl> login_screen_client_;
   std::unique_ptr<MediaClientImpl> media_client_;
   std::unique_ptr<policy::DisplaySettingsHandler> display_settings_handler_;
 
diff --git a/chrome/browser/ui/ash/login_screen_client.cc b/chrome/browser/ui/ash/login_screen_client_impl.cc
similarity index 77%
rename from chrome/browser/ui/ash/login_screen_client.cc
rename to chrome/browser/ui/ash/login_screen_client_impl.cc
index f0664997acc282..c7950defb7e1ec 100644
--- a/chrome/browser/ui/ash/login_screen_client.cc
+++ b/chrome/browser/ui/ash/login_screen_client_impl.cc
@@ -2,7 +2,7 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#include "chrome/browser/ui/ash/login_screen_client.h"
+#include "chrome/browser/ui/ash/login_screen_client_impl.h"
 
 #include <utility>
 
@@ -37,15 +37,15 @@
 namespace {
 using ash::SupervisedAction;
 
-LoginScreenClient* g_login_screen_client_instance = nullptr;
+LoginScreenClientImpl* g_login_screen_client_instance = nullptr;
 }  // namespace
 
-LoginScreenClient::Delegate::Delegate() = default;
-LoginScreenClient::Delegate::~Delegate() = default;
+LoginScreenClientImpl::Delegate::Delegate() = default;
+LoginScreenClientImpl::Delegate::~Delegate() = default;
 
-LoginScreenClient::ParentAccessDelegate::~ParentAccessDelegate() = default;
+LoginScreenClientImpl::ParentAccessDelegate::~ParentAccessDelegate() = default;
 
-LoginScreenClient::LoginScreenClient()
+LoginScreenClientImpl::LoginScreenClientImpl()
     : auth_recorder_(std::make_unique<chromeos::LoginAuthRecorder>()) {
   // Register this object as the client interface implementation.
   ash::LoginScreen::Get()->SetClient(this);
@@ -54,52 +54,52 @@ LoginScreenClient::LoginScreenClient()
   g_login_screen_client_instance = this;
 }
 
-LoginScreenClient::~LoginScreenClient() {
+LoginScreenClientImpl::~LoginScreenClientImpl() {
   ash::LoginScreen::Get()->SetClient(nullptr);
   DCHECK_EQ(this, g_login_screen_client_instance);
   g_login_screen_client_instance = nullptr;
 }
 
 // static
-bool LoginScreenClient::HasInstance() {
+bool LoginScreenClientImpl::HasInstance() {
   return !!g_login_screen_client_instance;
 }
 
 // static
-LoginScreenClient* LoginScreenClient::Get() {
+LoginScreenClientImpl* LoginScreenClientImpl::Get() {
   DCHECK(g_login_screen_client_instance);
   return g_login_screen_client_instance;
 }
 
-void LoginScreenClient::SetDelegate(Delegate* delegate) {
+void LoginScreenClientImpl::SetDelegate(Delegate* delegate) {
   delegate_ = delegate;
 }
 
-void LoginScreenClient::AddSystemTrayObserver(
+void LoginScreenClientImpl::AddSystemTrayObserver(
     ash::SystemTrayObserver* observer) {
   system_tray_observers_.AddObserver(observer);
 }
 
-void LoginScreenClient::RemoveSystemTrayObserver(
+void LoginScreenClientImpl::RemoveSystemTrayObserver(
     ash::SystemTrayObserver* observer) {
   system_tray_observers_.RemoveObserver(observer);
 }
 
-void LoginScreenClient::AddLoginScreenShownObserver(
+void LoginScreenClientImpl::AddLoginScreenShownObserver(
     LoginScreenShownObserver* observer) {
   login_screen_shown_observers_.AddObserver(observer);
 }
 
-void LoginScreenClient::RemoveLoginScreenShownObserver(
+void LoginScreenClientImpl::RemoveLoginScreenShownObserver(
     LoginScreenShownObserver* observer) {
   login_screen_shown_observers_.RemoveObserver(observer);
 }
 
-chromeos::LoginAuthRecorder* LoginScreenClient::auth_recorder() {
+chromeos::LoginAuthRecorder* LoginScreenClientImpl::auth_recorder() {
   return auth_recorder_.get();
 }
 
-void LoginScreenClient::AuthenticateUserWithPasswordOrPin(
+void LoginScreenClientImpl::AuthenticateUserWithPasswordOrPin(
     const AccountId& account_id,
     const std::string& password,
     bool authenticated_by_pin,
@@ -117,7 +117,7 @@ void LoginScreenClient::AuthenticateUserWithPasswordOrPin(
   }
 }
 
-void LoginScreenClient::AuthenticateUserWithEasyUnlock(
+void LoginScreenClientImpl::AuthenticateUserWithEasyUnlock(
     const AccountId& account_id) {
   if (delegate_) {
     delegate_->HandleAuthenticateUserWithEasyUnlock(account_id);
@@ -126,7 +126,7 @@ void LoginScreenClient::AuthenticateUserWithEasyUnlock(
   }
 }
 
-void LoginScreenClient::AuthenticateUserWithChallengeResponse(
+void LoginScreenClientImpl::AuthenticateUserWithChallengeResponse(
     const AccountId& account_id,
     base::OnceCallback<void(bool)> callback) {
   if (delegate_) {
@@ -137,7 +137,7 @@ void LoginScreenClient::AuthenticateUserWithChallengeResponse(
   }
 }
 
-ash::ParentCodeValidationResult LoginScreenClient::ValidateParentAccessCode(
+ash::ParentCodeValidationResult LoginScreenClientImpl::ValidateParentAccessCode(
     const AccountId& account_id,
     const std::string& access_code,
     base::Time validation_time) {
@@ -145,22 +145,22 @@ ash::ParentCodeValidationResult LoginScreenClient::ValidateParentAccessCode(
       .ValidateParentAccessCode(account_id, access_code, validation_time);
 }
 
-void LoginScreenClient::HardlockPod(const AccountId& account_id) {
+void LoginScreenClientImpl::HardlockPod(const AccountId& account_id) {
   if (delegate_)
     delegate_->HandleHardlockPod(account_id);
 }
 
-void LoginScreenClient::OnFocusPod(const AccountId& account_id) {
+void LoginScreenClientImpl::OnFocusPod(const AccountId& account_id) {
   if (delegate_)
     delegate_->HandleOnFocusPod(account_id);
 }
 
-void LoginScreenClient::OnNoPodFocused() {
+void LoginScreenClientImpl::OnNoPodFocused() {
   if (delegate_)
     delegate_->HandleOnNoPodFocused();
 }
 
-void LoginScreenClient::FocusLockScreenApps(bool reverse) {
+void LoginScreenClientImpl::FocusLockScreenApps(bool reverse) {
   // If delegate is not set, or it fails to handle focus request, call
   // |HandleFocusLeavingLockScreenApps| so the lock screen service can
   // give focus to the next window in the tab order.
@@ -170,12 +170,12 @@ void LoginScreenClient::FocusLockScreenApps(bool reverse) {
   }
 }
 
-void LoginScreenClient::FocusOobeDialog() {
+void LoginScreenClientImpl::FocusOobeDialog() {
   if (delegate_)
     delegate_->HandleFocusOobeDialog();
 }
 
-void LoginScreenClient::ShowGaiaSignin(const AccountId& prefilled_account) {
+void LoginScreenClientImpl::ShowGaiaSignin(const AccountId& prefilled_account) {
   auto supervised_action = prefilled_account.empty()
                                ? SupervisedAction::kAddUser
                                : SupervisedAction::kReauth;
@@ -188,7 +188,7 @@ void LoginScreenClient::ShowGaiaSignin(const AccountId& prefilled_account) {
     // requires reauth, so we are passing an empty |account_id|.
     ash::ParentAccessController::Get()->ShowWidget(
         AccountId(),
-        base::BindOnce(&LoginScreenClient::OnParentAccessValidation,
+        base::BindOnce(&LoginScreenClientImpl::OnParentAccessValidation,
                        weak_ptr_factory_.GetWeakPtr(), prefilled_account),
         supervised_action, false /* extra_dimmer */, base::Time::Now());
   } else {
@@ -196,12 +196,12 @@ void LoginScreenClient::ShowGaiaSignin(const AccountId& prefilled_account) {
   }
 }
 
-void LoginScreenClient::OnRemoveUserWarningShown() {
+void LoginScreenClientImpl::OnRemoveUserWarningShown() {
   ProfileMetrics::LogProfileDeleteUser(
       ProfileMetrics::DELETE_PROFILE_USER_MANAGER_SHOW_WARNING);
 }
 
-void LoginScreenClient::RemoveUser(const AccountId& account_id) {
+void LoginScreenClientImpl::RemoveUser(const AccountId& account_id) {
   ProfileMetrics::LogProfileDeleteUser(
       ProfileMetrics::DELETE_PROFILE_USER_MANAGER);
   user_manager::UserManager::Get()->RemoveUser(account_id,
@@ -210,75 +210,77 @@ void LoginScreenClient::RemoveUser(const AccountId& account_id) {
     chromeos::LoginDisplayHost::default_host()->UpdateAddUserButtonStatus();
 }
 
-void LoginScreenClient::LaunchPublicSession(const AccountId& account_id,
-                                            const std::string& locale,
-                                            const std::string& input_method) {
+void LoginScreenClientImpl::LaunchPublicSession(
+    const AccountId& account_id,
+    const std::string& locale,
+    const std::string& input_method) {
   if (delegate_)
     delegate_->HandleLaunchPublicSession(account_id, locale, input_method);
 }
 
-void LoginScreenClient::RequestPublicSessionKeyboardLayouts(
+void LoginScreenClientImpl::RequestPublicSessionKeyboardLayouts(
     const AccountId& account_id,
     const std::string& locale) {
   chromeos::GetKeyboardLayoutsForLocale(
-      base::BindOnce(&LoginScreenClient::SetPublicSessionKeyboardLayout,
+      base::BindOnce(&LoginScreenClientImpl::SetPublicSessionKeyboardLayout,
                      weak_ptr_factory_.GetWeakPtr(), account_id, locale),
       locale);
 }
 
-void LoginScreenClient::HandleAccelerator(ash::LoginAcceleratorAction action) {
+void LoginScreenClientImpl::HandleAccelerator(
+    ash::LoginAcceleratorAction action) {
   if (chromeos::LoginDisplayHost::default_host())
     chromeos::LoginDisplayHost::default_host()->HandleAccelerator(action);
 }
 
-void LoginScreenClient::ShowAccountAccessHelpApp(
+void LoginScreenClientImpl::ShowAccountAccessHelpApp(
     gfx::NativeWindow parent_window) {
   scoped_refptr<chromeos::HelpAppLauncher>(
       new chromeos::HelpAppLauncher(parent_window))
       ->ShowHelpTopic(chromeos::HelpAppLauncher::HELP_CANT_ACCESS_ACCOUNT);
 }
 
-void LoginScreenClient::ShowParentAccessHelpApp(
+void LoginScreenClientImpl::ShowParentAccessHelpApp(
     gfx::NativeWindow parent_window) {
   scoped_refptr<chromeos::HelpAppLauncher>(
       new chromeos::HelpAppLauncher(parent_window))
       ->ShowHelpTopic(chromeos::HelpAppLauncher::HELP_PARENT_ACCESS_CODE);
 }
 
-void LoginScreenClient::ShowLockScreenNotificationSettings() {
+void LoginScreenClientImpl::ShowLockScreenNotificationSettings() {
   chrome::SettingsWindowManager::GetInstance()->ShowOSSettings(
       ProfileManager::GetActiveUserProfile(),
       chromeos::settings::mojom::kSecurityAndSignInSubpagePath);
 }
 
-void LoginScreenClient::OnFocusLeavingSystemTray(bool reverse) {
+void LoginScreenClientImpl::OnFocusLeavingSystemTray(bool reverse) {
   for (ash::SystemTrayObserver& observer : system_tray_observers_)
     observer.OnFocusLeavingSystemTray(reverse);
 }
 
-void LoginScreenClient::OnSystemTrayBubbleShown() {
+void LoginScreenClientImpl::OnSystemTrayBubbleShown() {
   for (ash::SystemTrayObserver& observer : system_tray_observers_)
     observer.OnSystemTrayBubbleShown();
 }
 
-void LoginScreenClient::OnLoginScreenShown() {
+void LoginScreenClientImpl::OnLoginScreenShown() {
   for (LoginScreenShownObserver& observer : login_screen_shown_observers_)
     observer.OnLoginScreenShown();
 }
 
-void LoginScreenClient::LoadWallpaper(const AccountId& account_id) {
+void LoginScreenClientImpl::LoadWallpaper(const AccountId& account_id) {
   WallpaperControllerClientImpl::Get()->ShowUserWallpaper(account_id);
 }
 
-void LoginScreenClient::SignOutUser() {
+void LoginScreenClientImpl::SignOutUser() {
   chromeos::ScreenLocker::default_screen_locker()->Signout();
 }
 
-void LoginScreenClient::CancelAddUser() {
+void LoginScreenClientImpl::CancelAddUser() {
   chromeos::UserAddingScreen::Get()->Cancel();
 }
 
-void LoginScreenClient::LoginAsGuest() {
+void LoginScreenClientImpl::LoginAsGuest() {
   DCHECK(!chromeos::ScreenLocker::default_screen_locker());
   if (chromeos::LoginDisplayHost::default_host()) {
     chromeos::LoginDisplayHost::default_host()
@@ -289,13 +291,13 @@ void LoginScreenClient::LoginAsGuest() {
   }
 }
 
-void LoginScreenClient::OnMaxIncorrectPasswordAttempted(
+void LoginScreenClientImpl::OnMaxIncorrectPasswordAttempted(
     const AccountId& account_id) {
   RecordReauthReason(account_id,
                      chromeos::ReauthReason::INCORRECT_PASSWORD_ENTERED);
 }
 
-void LoginScreenClient::SetPublicSessionKeyboardLayout(
+void LoginScreenClientImpl::SetPublicSessionKeyboardLayout(
     const AccountId& account_id,
     const std::string& locale,
     std::unique_ptr<base::ListValue> keyboard_layouts) {
@@ -324,7 +326,7 @@ void LoginScreenClient::SetPublicSessionKeyboardLayout(
       account_id, locale, result);
 }
 
-void LoginScreenClient::OnUserActivity() {
+void LoginScreenClientImpl::OnUserActivity() {
   if (chromeos::LoginDisplayHost::default_host()) {
     chromeos::LoginDisplayHost::default_host()
         ->GetExistingUserController()
@@ -332,14 +334,14 @@ void LoginScreenClient::OnUserActivity() {
   }
 }
 
-void LoginScreenClient::OnParentAccessValidation(
+void LoginScreenClientImpl::OnParentAccessValidation(
     const AccountId& prefilled_account,
     bool success) {
   if (success)
     ShowGaiaSigninInternal(prefilled_account);
 }
 
-void LoginScreenClient::ShowGaiaSigninInternal(
+void LoginScreenClientImpl::ShowGaiaSigninInternal(
     const AccountId& prefilled_account) {
   if (chromeos::LoginDisplayHost::default_host()) {
     chromeos::LoginDisplayHost::default_host()->ShowGaiaDialog(
@@ -355,4 +357,4 @@ void LoginScreenClient::ShowGaiaSigninInternal(
       password_sync_manager->CreateAndShowDialog();
     }
   }
-  }
+}
diff --git a/chrome/browser/ui/ash/login_screen_client.h b/chrome/browser/ui/ash/login_screen_client_impl.h
similarity index 92%
rename from chrome/browser/ui/ash/login_screen_client.h
rename to chrome/browser/ui/ash/login_screen_client_impl.h
index f85e4f81761795..5d89ade8794826 100644
--- a/chrome/browser/ui/ash/login_screen_client.h
+++ b/chrome/browser/ui/ash/login_screen_client_impl.h
@@ -2,8 +2,8 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#ifndef CHROME_BROWSER_UI_ASH_LOGIN_SCREEN_CLIENT_H_
-#define CHROME_BROWSER_UI_ASH_LOGIN_SCREEN_CLIENT_H_
+#ifndef CHROME_BROWSER_UI_ASH_LOGIN_SCREEN_CLIENT_IMPL_H_
+#define CHROME_BROWSER_UI_ASH_LOGIN_SCREEN_CLIENT_IMPL_H_
 
 #include "ash/public/cpp/login_accelerators.h"
 #include "ash/public/cpp/login_screen_client.h"
@@ -28,7 +28,7 @@ class LoginAuthRecorder;
 
 // Handles method calls sent from ash to chrome. Also sends messages from chrome
 // to ash.
-class LoginScreenClient : public ash::LoginScreenClient {
+class LoginScreenClientImpl : public ash::LoginScreenClient {
  public:
   // Handles method calls coming from ash into chrome.
   class Delegate {
@@ -69,10 +69,10 @@ class LoginScreenClient : public ash::LoginScreenClient {
     virtual bool ValidateParentAccessCode(const std::string& access_code) = 0;
   };
 
-  LoginScreenClient();
-  ~LoginScreenClient() override;
+  LoginScreenClientImpl();
+  ~LoginScreenClientImpl() override;
   static bool HasInstance();
-  static LoginScreenClient* Get();
+  static LoginScreenClientImpl* Get();
 
   // Set the object which will handle calls coming from ash.
   void SetDelegate(Delegate* delegate);
@@ -148,9 +148,9 @@ class LoginScreenClient : public ash::LoginScreenClient {
 
   base::ObserverList<LoginScreenShownObserver> login_screen_shown_observers_;
 
-  base::WeakPtrFactory<LoginScreenClient> weak_ptr_factory_{this};
+  base::WeakPtrFactory<LoginScreenClientImpl> weak_ptr_factory_{this};
 
-  DISALLOW_COPY_AND_ASSIGN(LoginScreenClient);
+  DISALLOW_COPY_AND_ASSIGN(LoginScreenClientImpl);
 };
 
-#endif  // CHROME_BROWSER_UI_ASH_LOGIN_SCREEN_CLIENT_H_
+#endif  // CHROME_BROWSER_UI_ASH_LOGIN_SCREEN_CLIENT_IMPL_H_
diff --git a/chrome/browser/ui/webui/chromeos/login/gaia_screen_handler.cc b/chrome/browser/ui/webui/chromeos/login/gaia_screen_handler.cc
index 583574c53ef356..f06c8462c09ffb 100644
--- a/chrome/browser/ui/webui/chromeos/login/gaia_screen_handler.cc
+++ b/chrome/browser/ui/webui/chromeos/login/gaia_screen_handler.cc
@@ -60,7 +60,6 @@
 #include "chrome/browser/lifetime/browser_shutdown.h"
 #include "chrome/browser/net/system_network_context_manager.h"
 #include "chrome/browser/profiles/profile.h"
-#include "chrome/browser/ui/ash/login_screen_client.h"
 #include "chrome/browser/ui/webui/chromeos/login/cookie_waiter.h"
 #include "chrome/browser/ui/webui/chromeos/login/enrollment_screen_handler.h"
 #include "chrome/browser/ui/webui/chromeos/login/reset_screen_handler.h"
diff --git a/chrome/browser/ui/webui/chromeos/login/supervision_transition_screen_handler.cc b/chrome/browser/ui/webui/chromeos/login/supervision_transition_screen_handler.cc
index f416604a6d1216..c1ac2f39aee941 100644
--- a/chrome/browser/ui/webui/chromeos/login/supervision_transition_screen_handler.cc
+++ b/chrome/browser/ui/webui/chromeos/login/supervision_transition_screen_handler.cc
@@ -15,7 +15,6 @@
 #include "chrome/browser/ash/profiles/profile_helper.h"
 #include "chrome/browser/browser_process.h"
 #include "chrome/browser/profiles/profile_manager.h"
-#include "chrome/browser/ui/ash/login_screen_client.h"
 #include "chrome/browser/ui/ash/system_tray_client.h"
 #include "chrome/grit/generated_resources.h"
 #include "components/arc/arc_prefs.h"