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

Side by Side Diff: chrome/browser/chromeos/login/ui/webui_login_display.cc

Issue 378513005: [Athena] Extract Chrome OS authentication stack (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Fix includes in one more test Created 6 years, 5 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/ui/webui_login_display.h" 5 #include "chrome/browser/chromeos/login/ui/webui_login_display.h"
6 6
7 #include "ash/shell.h" 7 #include "ash/shell.h"
8 #include "chrome/browser/chromeos/accessibility/accessibility_manager.h" 8 #include "chrome/browser/chromeos/accessibility/accessibility_manager.h"
9 #include "chrome/browser/chromeos/login/lock/screen_locker.h" 9 #include "chrome/browser/chromeos/login/lock/screen_locker.h"
10 #include "chrome/browser/chromeos/login/ui/login_display_host_impl.h" 10 #include "chrome/browser/chromeos/login/ui/login_display_host_impl.h"
11 #include "chrome/browser/chromeos/login/ui/user_adding_screen.h" 11 #include "chrome/browser/chromeos/login/ui/user_adding_screen.h"
12 #include "chrome/browser/chromeos/login/ui/webui_login_view.h" 12 #include "chrome/browser/chromeos/login/ui/webui_login_view.h"
13 #include "chrome/browser/chromeos/login/users/wallpaper/wallpaper_manager.h" 13 #include "chrome/browser/chromeos/login/users/wallpaper/wallpaper_manager.h"
14 #include "chrome/browser/profiles/profile_manager.h" 14 #include "chrome/browser/profiles/profile_manager.h"
15 #include "chrome/browser/ui/browser_window.h" 15 #include "chrome/browser/ui/browser_window.h"
16 #include "chromeos/ime/ime_keyboard.h" 16 #include "chromeos/ime/ime_keyboard.h"
17 #include "chromeos/ime/input_method_manager.h" 17 #include "chromeos/ime/input_method_manager.h"
18 #include "chromeos/login/user_names.h"
18 #include "grit/chromium_strings.h" 19 #include "grit/chromium_strings.h"
19 #include "grit/generated_resources.h" 20 #include "grit/generated_resources.h"
20 #include "ui/base/l10n/l10n_util.h" 21 #include "ui/base/l10n/l10n_util.h"
21 #include "ui/views/widget/widget.h" 22 #include "ui/views/widget/widget.h"
22 #include "ui/wm/core/user_activity_detector.h" 23 #include "ui/wm/core/user_activity_detector.h"
23 24
24 namespace chromeos { 25 namespace chromeos {
25 26
26 // WebUILoginDisplay, public: -------------------------------------------------- 27 // WebUILoginDisplay, public: --------------------------------------------------
27 28
(...skipping 230 matching lines...) Expand 10 before | Expand all | Expand 10 after
258 DCHECK(delegate_); 259 DCHECK(delegate_);
259 if (delegate_) 260 if (delegate_)
260 delegate_->MigrateUserData(old_password); 261 delegate_->MigrateUserData(old_password);
261 } 262 }
262 263
263 void WebUILoginDisplay::LoadWallpaper(const std::string& username) { 264 void WebUILoginDisplay::LoadWallpaper(const std::string& username) {
264 WallpaperManager::Get()->SetUserWallpaperDelayed(username); 265 WallpaperManager::Get()->SetUserWallpaperDelayed(username);
265 } 266 }
266 267
267 void WebUILoginDisplay::LoadSigninWallpaper() { 268 void WebUILoginDisplay::LoadSigninWallpaper() {
268 WallpaperManager::Get()->SetDefaultWallpaperDelayed(UserManager::kSignInUser); 269 WallpaperManager::Get()->SetDefaultWallpaperDelayed(
270 chromeos::login::kSignInUser);
269 } 271 }
270 272
271 void WebUILoginDisplay::OnSigninScreenReady() { 273 void WebUILoginDisplay::OnSigninScreenReady() {
272 if (delegate_) 274 if (delegate_)
273 delegate_->OnSigninScreenReady(); 275 delegate_->OnSigninScreenReady();
274 } 276 }
275 277
276 void WebUILoginDisplay::RemoveUser(const std::string& username) { 278 void WebUILoginDisplay::RemoveUser(const std::string& username) {
277 UserManager::Get()->RemoveUser(username, this); 279 UserManager::Get()->RemoveUser(username, this);
278 } 280 }
(...skipping 63 matching lines...) Expand 10 before | Expand all | Expand 10 after
342 delegate_->Signout(); 344 delegate_->Signout();
343 } 345 }
344 346
345 void WebUILoginDisplay::OnUserActivity(const ui::Event* event) { 347 void WebUILoginDisplay::OnUserActivity(const ui::Event* event) {
346 if (delegate_) 348 if (delegate_)
347 delegate_->ResetPublicSessionAutoLoginTimer(); 349 delegate_->ResetPublicSessionAutoLoginTimer();
348 } 350 }
349 351
350 352
351 } // namespace chromeos 353 } // namespace chromeos
OLDNEW
« no previous file with comments | « chrome/browser/chromeos/login/test_login_utils.cc ('k') | chrome/browser/chromeos/login/users/supervised_user_manager_impl.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698