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

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

Issue 289013002: cros: Clean up screenlockPrivate plumbing. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: rebase 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/lock/screen_locker.h
diff --git a/chrome/browser/chromeos/login/lock/screen_locker.h b/chrome/browser/chromeos/login/lock/screen_locker.h
index 6d8f1f5b29b4e326c2bb3e7774aa3c9f82306976..105df70f17222a7c54f764e92f26fb73ee6cc42a 100644
--- a/chrome/browser/chromeos/login/lock/screen_locker.h
+++ b/chrome/browser/chromeos/login/lock/screen_locker.h
@@ -19,7 +19,6 @@
#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 {
@@ -46,8 +45,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);
@@ -78,19 +76,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"
« no previous file with comments | « chrome/browser/chromeos/extensions/screenlock_private_apitest.cc ('k') | chrome/browser/chromeos/login/lock/screen_locker.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698