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

Side by Side Diff: chrome/browser/chromeos/login/ui/webui_login_display.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/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/screens/chrome_user_selection_screen.h"
10 #include "chrome/browser/chromeos/login/ui/login_display_host_impl.h" 11 #include "chrome/browser/chromeos/login/ui/login_display_host_impl.h"
11 #include "chrome/browser/chromeos/login/ui/user_adding_screen.h" 12 #include "chrome/browser/chromeos/login/ui/user_adding_screen.h"
12 #include "chrome/browser/chromeos/login/ui/webui_login_view.h" 13 #include "chrome/browser/chromeos/login/ui/webui_login_view.h"
13 #include "chrome/browser/chromeos/login/users/wallpaper/wallpaper_manager.h" 14 #include "chrome/browser/chromeos/login/users/wallpaper/wallpaper_manager.h"
14 #include "chrome/browser/profiles/profile_manager.h" 15 #include "chrome/browser/profiles/profile_manager.h"
15 #include "chrome/browser/ui/browser_window.h" 16 #include "chrome/browser/ui/browser_window.h"
16 #include "chromeos/ime/ime_keyboard.h" 17 #include "chromeos/ime/ime_keyboard.h"
17 #include "chromeos/ime/input_method_manager.h" 18 #include "chromeos/ime/input_method_manager.h"
18 #include "chromeos/login/user_names.h" 19 #include "chromeos/login/user_names.h"
19 #include "grit/chromium_strings.h" 20 #include "grit/chromium_strings.h"
(...skipping 16 matching lines...) Expand all
36 } 37 }
37 38
38 // LoginDisplay implementation: ------------------------------------------------ 39 // LoginDisplay implementation: ------------------------------------------------
39 40
40 WebUILoginDisplay::WebUILoginDisplay(LoginDisplay::Delegate* delegate) 41 WebUILoginDisplay::WebUILoginDisplay(LoginDisplay::Delegate* delegate)
41 : LoginDisplay(delegate, gfx::Rect()), 42 : LoginDisplay(delegate, gfx::Rect()),
42 show_guest_(false), 43 show_guest_(false),
43 show_new_user_(false), 44 show_new_user_(false),
44 webui_handler_(NULL), 45 webui_handler_(NULL),
45 gaia_screen_(new GaiaScreen()), 46 gaia_screen_(new GaiaScreen()),
46 user_selection_screen_(new UserSelectionScreen()) { 47 user_selection_screen_(new ChromeUserSelectionScreen()) {
47 } 48 }
48 49
49 void WebUILoginDisplay::ClearAndEnablePassword() { 50 void WebUILoginDisplay::ClearAndEnablePassword() {
50 if (webui_handler_) 51 if (webui_handler_)
51 webui_handler_->ClearAndEnablePassword(); 52 webui_handler_->ClearAndEnablePassword();
52 } 53 }
53 54
54 void WebUILoginDisplay::Init(const user_manager::UserList& users, 55 void WebUILoginDisplay::Init(const user_manager::UserList& users,
55 bool show_guest, 56 bool show_guest,
56 bool show_users, 57 bool show_users,
(...skipping 287 matching lines...) Expand 10 before | Expand all | Expand 10 after
344 delegate_->Signout(); 345 delegate_->Signout();
345 } 346 }
346 347
347 void WebUILoginDisplay::OnUserActivity(const ui::Event* event) { 348 void WebUILoginDisplay::OnUserActivity(const ui::Event* event) {
348 if (delegate_) 349 if (delegate_)
349 delegate_->ResetPublicSessionAutoLoginTimer(); 350 delegate_->ResetPublicSessionAutoLoginTimer();
350 } 351 }
351 352
352 353
353 } // namespace chromeos 354 } // namespace chromeos
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698