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

Side by Side 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: Fix linux build 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 unified diff | Download patch
OLDNEW
1 // Copyright 2013 The Chromium Authors. All rights reserved. 1 // Copyright 2013 The Chromium Authors. All rights reserved.
2 // Use of this source code is governed by a BSD-style license that can be 2 // Use of this source code is governed by a BSD-style license that can be
3 // found in the LICENSE file. 3 // found in the LICENSE file.
4 4
5 #include "chrome/browser/chromeos/login/app_launch_signin_screen.h" 5 #include "chrome/browser/chromeos/login/app_launch_signin_screen.h"
6 6
7 #include "base/values.h" 7 #include "base/values.h"
8 #include "chrome/browser/chromeos/login/help_app_launcher.h" 8 #include "chrome/browser/chromeos/login/help_app_launcher.h"
9 #include "chrome/browser/chromeos/login/screens/user_selection_screen.h" 9 #include "chrome/browser/chromeos/login/screens/user_selection_screen.h"
10 #include "chrome/browser/chromeos/login/session/user_session_manager.h" 10 #include "chrome/browser/chromeos/login/session/user_session_manager.h"
11 #include "chrome/browser/signin/screenlock_bridge.h"
12 #include "chrome/browser/ui/webui/chromeos/login/signin_screen_handler.h" 11 #include "chrome/browser/ui/webui/chromeos/login/signin_screen_handler.h"
13 #include "chrome/grit/generated_resources.h" 12 #include "chrome/grit/generated_resources.h"
14 #include "chromeos/login/auth/user_context.h" 13 #include "chromeos/login/auth/user_context.h"
14 #include "components/signin/content/screenlock_bridge.h"
15 #include "components/user_manager/user_manager.h" 15 #include "components/user_manager/user_manager.h"
16 #include "content/public/browser/browser_thread.h" 16 #include "content/public/browser/browser_thread.h"
17 #include "content/public/browser/web_ui.h" 17 #include "content/public/browser/web_ui.h"
18 #include "ui/base/l10n/l10n_util.h" 18 #include "ui/base/l10n/l10n_util.h"
19 19
20 namespace chromeos { 20 namespace chromeos {
21 21
22 user_manager::UserManager* AppLaunchSigninScreen::test_user_manager_ = NULL; 22 user_manager::UserManager* AppLaunchSigninScreen::test_user_manager_ = NULL;
23 23
24 AppLaunchSigninScreen::AppLaunchSigninScreen( 24 AppLaunchSigninScreen::AppLaunchSigninScreen(
(...skipping 189 matching lines...) Expand 10 before | Expand all | Expand 10 after
214 users_list.Append(user_dict); 214 users_list.Append(user_dict);
215 } 215 }
216 216
217 webui_handler_->LoadUsers(users_list, false); 217 webui_handler_->LoadUsers(users_list, false);
218 } 218 }
219 219
220 void AppLaunchSigninScreen::CheckUserStatus(const std::string& user_id) { 220 void AppLaunchSigninScreen::CheckUserStatus(const std::string& user_id) {
221 } 221 }
222 222
223 } // namespace chromeos 223 } // namespace chromeos
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698