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

Side by Side Diff: chrome/browser/chromeos/login/screens/user_selection_screen.cc

Issue 427053002: Do not reload account picker when device-local account policy changes (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Rebased. Moved policy code to Chrome-specific subclass. Created 6 years, 4 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 | Annotate | Revision Log
OLDNEW
1 // Copyright 2014 The Chromium Authors. All rights reserved. 1 // Copyright 2014 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/screens/user_selection_screen.h" 5 #include "chrome/browser/chromeos/login/screens/user_selection_screen.h"
6 6
7 #include <vector> 7 #include <vector>
8 8
9 #include "ash/shell.h" 9 #include "ash/shell.h"
10 #include "base/location.h"
10 #include "base/logging.h" 11 #include "base/logging.h"
11 #include "base/prefs/pref_service.h" 12 #include "base/prefs/pref_service.h"
13 #include "base/values.h"
12 #include "chrome/browser/browser_process.h" 14 #include "chrome/browser/browser_process.h"
15 #include "chrome/browser/browser_process_platform_part.h"
13 #include "chrome/browser/chromeos/login/ui/login_display_host_impl.h" 16 #include "chrome/browser/chromeos/login/ui/login_display_host_impl.h"
14 #include "chrome/browser/chromeos/login/users/multi_profile_user_controller.h" 17 #include "chrome/browser/chromeos/login/users/multi_profile_user_controller.h"
18 #include "chrome/browser/chromeos/login/users/user_manager.h"
15 #include "chrome/browser/chromeos/policy/browser_policy_connector_chromeos.h" 19 #include "chrome/browser/chromeos/policy/browser_policy_connector_chromeos.h"
16 #include "chrome/browser/signin/screenlock_bridge.h" 20 #include "chrome/browser/signin/screenlock_bridge.h"
17 #include "chrome/browser/ui/webui/chromeos/login/l10n_util.h" 21 #include "chrome/browser/ui/webui/chromeos/login/l10n_util.h"
18 #include "chrome/browser/ui/webui/chromeos/login/signin_screen_handler.h" 22 #include "chrome/browser/ui/webui/chromeos/login/signin_screen_handler.h"
19 #include "chrome/common/pref_names.h" 23 #include "chrome/common/pref_names.h"
20 #include "components/user_manager/user_type.h" 24 #include "components/user_manager/user_type.h"
21 #include "ui/wm/core/user_activity_detector.h" 25 #include "ui/wm/core/user_activity_detector.h"
22 26
23 namespace chromeos { 27 namespace chromeos {
24 28
(...skipping 283 matching lines...) Expand 10 before | Expand all | Expand 10 after
308 } 312 }
309 313
310 ScreenlockBridge::LockHandler::AuthType UserSelectionScreen::GetAuthType( 314 ScreenlockBridge::LockHandler::AuthType UserSelectionScreen::GetAuthType(
311 const std::string& username) const { 315 const std::string& username) const {
312 if (user_auth_type_map_.find(username) == user_auth_type_map_.end()) 316 if (user_auth_type_map_.find(username) == user_auth_type_map_.end())
313 return ScreenlockBridge::LockHandler::OFFLINE_PASSWORD; 317 return ScreenlockBridge::LockHandler::OFFLINE_PASSWORD;
314 return user_auth_type_map_.find(username)->second; 318 return user_auth_type_map_.find(username)->second;
315 } 319 }
316 320
317 } // namespace chromeos 321 } // namespace chromeos
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698