cros: Cleanup lock screen and OOBE C++ backing code.

chrome/browser/chromeos/login/lock/screen_locker.h

 // Copyright 2014 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #ifndef CHROME_BROWSER_CHROMEOS_LOGIN_LOCK_SCREEN_LOCKER_H_
 #define CHROME_BROWSER_CHROMEOS_LOGIN_LOCK_SCREEN_LOCKER_H_
 
 #include <memory>
 #include <string>
 
 #include "base/callback_forward.h"
 #include "base/macros.h"
 #include "base/memory/ref_counted.h"
 #include "base/memory/weak_ptr.h"
 #include "base/sequenced_task_runner_helpers.h"
 #include "base/time/time.h"
 #include "chrome/browser/chromeos/login/help_app_launcher.h"
-#include "chrome/browser/chromeos/login/lock/screen_locker_delegate.h"
 #include "chrome/browser/chromeos/login/ui/login_display.h"
 #include "chromeos/login/auth/auth_status_consumer.h"
 #include "chromeos/login/auth/user_context.h"
 #include "components/user_manager/user.h"
 #include "ui/base/accelerators/accelerator.h"
 #include "ui/base/ime/chromeos/input_method_manager.h"
 
 namespace content {
 class WebUI;
 }
 
 namespace gfx {
 class Image;
 }
 
 namespace chromeos {
 
 class Authenticator;
 class ExtendedAuthenticator;
 class AuthFailure;
 class ScreenlockIconProvider;
+class WebUIScreenLocker;
 
 namespace test {
 class ScreenLockerTester;
 class ScreenLockerViewsTester;
 class WebUIScreenLockerTester;
 }  // namespace test
 
-// ScreenLocker creates a ScreenLockerDelegate which will display the lock UI.
+// ScreenLocker creates a WebUIScreenLocker which will display the lock UI.
 // As well, it takes care of authenticating the user and managing a global
 // instance of itself which will be deleted when the system is unlocked.
 class ScreenLocker : public AuthStatusConsumer {
  public:
   explicit ScreenLocker(const user_manager::UserList& users);
 
   // Returns the default instance if it has been created.
   static ScreenLocker* default_screen_locker() {
     return screen_locker_;
   }
@@ skipping 27 matching lines @@
   // (Re)enable input field.
   void EnableInput();
 
   // Disables all UI needed and shows error bubble with |message|.
   // If |sign_out_only| is true then all other input except "Sign Out"
   // button is blocked.
   void ShowErrorMessage(int error_msg_id,
                         HelpAppLauncher::HelpTopic help_topic_id,
                         bool sign_out_only);
 
-  // Returns the screen locker's delegate.
-  ScreenLockerDelegate* delegate() const { return delegate_.get(); }
+  // Returns the WebUIScreenLocker used to lock the screen.
+  WebUIScreenLocker* web_ui() const { return web_ui_.get(); }

[achuithb, 2016/10/20 17:38:33]

Wonder if we should drop the const here since we end up doing all kinds of
non-const operations with the raw pointer.

[jdufault, 2016/10/20 19:35:19]

I've dropped the const and made the preferred usage web_ui().

 
   // Returns the users to authenticate.
   const user_manager::UserList& users() const { return users_; }
 
   // Allow a AuthStatusConsumer to listen for
   // the same login events that ScreenLocker does.
   void SetLoginStatusConsumer(chromeos::AuthStatusConsumer* consumer);
 
-  // Returns WebUI associated with screen locker implementation or NULL if
-  // there isn't one.
-  content::WebUI* GetAssociatedWebUI();
-
   // Initialize or uninitialize the ScreenLocker class. It listens to
   // NOTIFICATION_SESSION_STARTED so that the screen locker accepts lock
   // requests only after a user has logged in.
   static void InitClass();
   static void ShutDownClass();
 
   // Handles a request from the session manager to lock the screen.
   static void HandleLockScreenRequest();
 
   // Show the screen locker.
   static void Show();
 
   // Hide the screen locker.
   static void Hide();
 
   // Returns the tester
   static test::ScreenLockerTester* GetTester();
 
  private:
   friend class base::DeleteHelper<ScreenLocker>;
   friend class test::ScreenLockerTester;
   friend class test::ScreenLockerViewsTester;
   friend class test::WebUIScreenLockerTester;
-  friend class ScreenLockerDelegate;
+  friend class WebUIScreenLocker;
 
   // Track whether the user used pin or password to unlock the lock screen.
   // Values corrospond to UMA histograms, do not modify, or add or delete other
   // than directly before AUTH_COUNT.
   enum UnlockType { AUTH_PASSWORD = 0, AUTH_PIN, AUTH_COUNT };
 
   struct AuthenticationParametersCapture {
     UserContext user_context;
   };
 
   ~ScreenLocker() override;
 
   // Sets the authenticator.
   void SetAuthenticator(Authenticator* authenticator);
 
   // Called when the screen lock is ready.
   void ScreenLockReady();
 
   // Called when screen locker is safe to delete.
   static void ScheduleDeletion();
 
   // Returns true if |account_id| is found among logged in users.
   bool IsUserLoggedIn(const AccountId& account_id) const;
 
   // Looks up user in unlock user list.
   const user_manager::User* FindUnlockUser(const AccountId& account_id);
 
-  // ScreenLockerDelegate instance in use.
-  std::unique_ptr<ScreenLockerDelegate> delegate_;
+  // WebUIScreenLocker instance in use.
+  std::unique_ptr<WebUIScreenLocker> web_ui_;
 
   // Users that can unlock the device.
   user_manager::UserList users_;
 
   // Used to authenticate the user to unlock.
   scoped_refptr<Authenticator> authenticator_;
 
   // Used to authenticate the user to unlock supervised users.
   scoped_refptr<ExtendedAuthenticator> extended_authenticator_;
 
@@ skipping 31 matching lines @@
   scoped_refptr<input_method::InputMethodManager::State> saved_ime_state_;
 
   base::WeakPtrFactory<ScreenLocker> weak_factory_;
 
   DISALLOW_COPY_AND_ASSIGN(ScreenLocker);
 };
 
 }  // namespace chromeos
 
 #endif  // CHROME_BROWSER_CHROMEOS_LOGIN_LOCK_SCREEN_LOCKER_H_