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

Unified Diff: chrome/browser/ui/webui/signin/user_manager_screen_handler.h

Issue 1096293003: Move screenlock_bridge to components/proximity_auth (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Rebase Created 5 years, 8 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/ui/webui/signin/user_manager_screen_handler.h
diff --git a/chrome/browser/ui/webui/signin/user_manager_screen_handler.h b/chrome/browser/ui/webui/signin/user_manager_screen_handler.h
index 2a68f7e857b52c11a8fdaa32c6c6c6ee54d60a28..98bf442571a8dec57a6ffdbb170e1f2aa494a66e 100644
--- a/chrome/browser/ui/webui/signin/user_manager_screen_handler.h
+++ b/chrome/browser/ui/webui/signin/user_manager_screen_handler.h
@@ -14,8 +14,8 @@
#include "base/memory/weak_ptr.h"
#include "chrome/browser/profiles/profile.h"
#include "chrome/browser/profiles/profile_metrics.h"
-#include "chrome/browser/signin/screenlock_bridge.h"
#include "chrome/browser/ui/host_desktop.h"
+#include "components/proximity_auth/screenlock_bridge.h"
#include "content/public/browser/notification_observer.h"
#include "content/public/browser/notification_registrar.h"
#include "content/public/browser/web_ui_message_handler.h"
@@ -29,10 +29,11 @@ class FilePath;
class ListValue;
}
-class UserManagerScreenHandler : public content::WebUIMessageHandler,
- public ScreenlockBridge::LockHandler,
- public GaiaAuthConsumer,
- public content::NotificationObserver {
+class UserManagerScreenHandler
+ : public content::WebUIMessageHandler,
+ public proximity_auth::ScreenlockBridge::LockHandler,
+ public GaiaAuthConsumer,
+ public content::NotificationObserver {
public:
UserManagerScreenHandler();
~UserManagerScreenHandler() override;
@@ -47,16 +48,18 @@ class UserManagerScreenHandler : public content::WebUIMessageHandler,
const content::NotificationSource& source,
const content::NotificationDetails& details) override;
- // ScreenlockBridge::LockHandler implementation.
+ // proximity_auth::ScreenlockBridge::LockHandler implementation.
void ShowBannerMessage(const base::string16& message) override;
void ShowUserPodCustomIcon(
const std::string& user_email,
- const ScreenlockBridge::UserPodCustomIconOptions& icon_options) override;
+ const proximity_auth::ScreenlockBridge::UserPodCustomIconOptions&
+ icon_options) override;
void HideUserPodCustomIcon(const std::string& user_email) override;
void EnableInput() override;
- void SetAuthType(const std::string& user_email,
- ScreenlockBridge::LockHandler::AuthType auth_type,
- const base::string16& auth_value) override;
+ void SetAuthType(
+ const std::string& user_email,
+ proximity_auth::ScreenlockBridge::LockHandler::AuthType auth_type,
+ const base::string16& auth_value) override;
AuthType GetAuthType(const std::string& user_email) const override;
ScreenType GetScreenType() const override;
void Unlock(const std::string& user_email) override;
@@ -115,7 +118,8 @@ class UserManagerScreenHandler : public content::WebUIMessageHandler,
// URL hash, used to key post-profile actions if present.
std::string url_hash_;
- typedef std::map<std::string, ScreenlockBridge::LockHandler::AuthType>
+ typedef std::map<std::string,
+ proximity_auth::ScreenlockBridge::LockHandler::AuthType>
UserAuthTypeMap;
UserAuthTypeMap user_auth_type_map_;

Powered by Google App Engine
This is Rietveld 408576698