Rename ::LoginScreenClient to LoginScreenClientImpl

::LoginScreenClient is an implementation of ash::LoginScreenClient. The
migration of chrome/browser/chromeos/ to chrome/browser/ash/ will force
to prefix the implementation class with :: to avoid name clashes in
multiple places.

This CL renames it adding the Impl suffix to avoid these kind of
clashes.

This CL is part of the Chrome OS source code directory migration:
https://docs.google.com/document/d/1g-98HpzA8XcoGBWUv1gQNr4rbnD5yfvbtYZyPDDbkaE.

Bug: 1164001
Change-Id: I703d18a12118da543c6cee886570e9c15d63c5a5
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2820302
Reviewed-by: Scott Violet <sky@chromium.org>
Reviewed-by: Hidehiko Abe <hidehiko@chromium.org>
Reviewed-by: Denis Kuznetsov [CET] <antrim@chromium.org>
Commit-Queue: Henrique Ferreiro <hferreiro@igalia.com>
Cr-Commit-Position: refs/heads/master@{#877512}

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;

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) {

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_{

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() {

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,

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

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) {

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"

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"

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);
     }
 

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;

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;

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,

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,

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.

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);
   }
 }
 

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) {

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_;