cros: Clean up screenlockPrivate plumbing.

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 <string>
 
 #include "base/callback_forward.h"
 #include "base/memory/ref_counted.h"
 #include "base/memory/scoped_ptr.h"
 #include "base/memory/weak_ptr.h"
 #include "base/sequenced_task_runner_helpers.h"
 #include "base/time/time.h"
 #include "chrome/browser/chromeos/login/auth/login_status_consumer.h"
 #include "chrome/browser/chromeos/login/auth/user_context.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 "chrome/browser/chromeos/login/users/user.h"
-#include "chrome/browser/signin/screenlock_bridge.h"
 #include "ui/base/accelerators/accelerator.h"
 
 namespace content {
 class WebUI;
 }
 
 namespace gfx {
 class Image;
 }
 
 namespace chromeos {
 
 class Authenticator;
 class ExtendedAuthenticator;
 class LoginFailure;
 class ScreenlockIconProvider;
 
 namespace test {
 class ScreenLockerTester;
 class ScreenLockerViewsTester;
 class WebUIScreenLockerTester;
 }  // namespace test
 
 // ScreenLocker creates a ScreenLockerDelegate 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 LoginStatusConsumer,
-                     public ScreenlockBridge::LockHandler {
+class ScreenLocker : public LoginStatusConsumer {
  public:
   explicit ScreenLocker(const UserList& users);
 
   // Returns the default instance if it has been created.
   static ScreenLocker* default_screen_locker() {
     return screen_locker_;
   }
 
   bool locked() const { return locked_; }
 
@@ skipping 10 matching lines @@
 
   // Authenticates the user with given |user_context|.
   void Authenticate(const UserContext& user_context);
 
   // Close message bubble to clear error messages.
   void ClearErrors();
 
   // Exit the chrome, which will sign out the current session.
   void Signout();
 
-  // ScreenlockBridge::LockHandler:
-  virtual void ShowBannerMessage(const std::string& message) OVERRIDE;
-  virtual void ShowUserPodButton(const std::string& username,
-                                 const gfx::Image& icon,
-                                 const base::Closure& click_callback) OVERRIDE;
-  virtual void HideUserPodButton(const std::string& username) OVERRIDE;
-  virtual void EnableInput() OVERRIDE;
-  virtual void SetAuthType(const std::string& username,
-                           ScreenlockBridge::LockHandler::AuthType auth_type,
-                           const std::string& initial_value) OVERRIDE;
-  virtual ScreenlockBridge::LockHandler::AuthType GetAuthType(
-      const std::string& username) const OVERRIDE;
-  virtual void Unlock(const std::string& user_email) OVERRIDE;
+  // (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(); }
@@ skipping 96 matching lines @@
   scoped_ptr<ScreenlockIconProvider> screenlock_icon_provider_;
 
   base::WeakPtrFactory<ScreenLocker> weak_factory_;
 
   DISALLOW_COPY_AND_ASSIGN(ScreenLocker);
 };
 
 }  // namespace chromeos
 
 #endif  // CHROME_BROWSER_CHROMEOS_LOGIN_LOCK_SCREEN_LOCKER_H_