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

Unified Diff: chrome/browser/chromeos/login/app_launch_signin_screen.cc

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/chromeos/login/app_launch_signin_screen.cc
diff --git a/chrome/browser/chromeos/login/app_launch_signin_screen.cc b/chrome/browser/chromeos/login/app_launch_signin_screen.cc
index d98d51b7a3bbc82d04bfd16399c66c21e3d936e1..e13afed32ea55c3087c40b1e8ba8e5a0f0dc9ce9 100644
--- a/chrome/browser/chromeos/login/app_launch_signin_screen.cc
+++ b/chrome/browser/chromeos/login/app_launch_signin_screen.cc
@@ -8,10 +8,10 @@
#include "chrome/browser/chromeos/login/help_app_launcher.h"
#include "chrome/browser/chromeos/login/screens/user_selection_screen.h"
#include "chrome/browser/chromeos/login/session/user_session_manager.h"
-#include "chrome/browser/signin/screenlock_bridge.h"
#include "chrome/browser/ui/webui/chromeos/login/signin_screen_handler.h"
#include "chrome/grit/generated_resources.h"
#include "chromeos/login/auth/user_context.h"
+#include "components/proximity_auth/screenlock_bridge.h"
#include "components/user_manager/user_manager.h"
#include "content/public/browser/browser_thread.h"
#include "content/public/browser/web_ui.h"
@@ -199,10 +199,10 @@ void AppLaunchSigninScreen::HandleGetUsers() {
for (user_manager::UserList::const_iterator it = users.begin();
it != users.end();
++it) {
- ScreenlockBridge::LockHandler::AuthType initial_auth_type =
+ proximity_auth::ScreenlockBridge::LockHandler::AuthType initial_auth_type =
UserSelectionScreen::ShouldForceOnlineSignIn(*it)
- ? ScreenlockBridge::LockHandler::ONLINE_SIGN_IN
- : ScreenlockBridge::LockHandler::OFFLINE_PASSWORD;
+ ? proximity_auth::ScreenlockBridge::LockHandler::ONLINE_SIGN_IN
+ : proximity_auth::ScreenlockBridge::LockHandler::OFFLINE_PASSWORD;
base::DictionaryValue* user_dict = new base::DictionaryValue();
UserSelectionScreen::FillUserDictionary(
*it,

Powered by Google App Engine
This is Rietveld 408576698