Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(895)

Unified Diff: chrome/browser/chromeos/login/screen_locker.h

Issue 289013002: cros: Clean up screenlockPrivate plumbing. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: fix test compile Created 6 years, 7 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
Index: chrome/browser/chromeos/login/screen_locker.h
diff --git a/chrome/browser/chromeos/login/screen_locker.h b/chrome/browser/chromeos/login/screen_locker.h
index 5d26f5c422f31e9575549e15923643668075a6a3..dcad6df09521f5da7ef735a94a20b4850eff1db8 100644
--- a/chrome/browser/chromeos/login/screen_locker.h
+++ b/chrome/browser/chromeos/login/screen_locker.h
@@ -18,7 +18,6 @@
#include "chrome/browser/chromeos/login/login_status_consumer.h"
#include "chrome/browser/chromeos/login/screen_locker_delegate.h"
#include "chrome/browser/chromeos/login/user.h"
-#include "chrome/browser/signin/screenlock_bridge.h"
#include "ui/base/accelerators/accelerator.h"
namespace content {
@@ -45,8 +44,7 @@ class WebUIScreenLockerTester;
// 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);
@@ -77,19 +75,8 @@ class ScreenLocker : public LoginStatusConsumer,
// 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"

Powered by Google App Engine
This is Rietveld 408576698