OLD | NEW |
1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. | 1 // Copyright (c) 2012 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/webui_login_display.h" | 5 #include "chrome/browser/chromeos/login/webui_login_display.h" |
6 | 6 |
7 #include "ash/wm/user_activity_detector.h" | 7 #include "ash/wm/user_activity_detector.h" |
8 #include "chrome/browser/chromeos/accessibility/accessibility_util.h" | 8 #include "chrome/browser/chromeos/accessibility/accessibility_manager.h" |
9 #include "chrome/browser/chromeos/login/login_display_host_impl.h" | 9 #include "chrome/browser/chromeos/login/login_display_host_impl.h" |
10 #include "chrome/browser/chromeos/login/screen_locker.h" | 10 #include "chrome/browser/chromeos/login/screen_locker.h" |
11 #include "chrome/browser/chromeos/login/user_adding_screen.h" | 11 #include "chrome/browser/chromeos/login/user_adding_screen.h" |
12 #include "chrome/browser/chromeos/login/wallpaper_manager.h" | 12 #include "chrome/browser/chromeos/login/wallpaper_manager.h" |
13 #include "chrome/browser/chromeos/login/webui_login_view.h" | 13 #include "chrome/browser/chromeos/login/webui_login_view.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/input_method_manager.h" | 16 #include "chromeos/ime/input_method_manager.h" |
17 #include "chromeos/ime/xkeyboard.h" | 17 #include "chromeos/ime/xkeyboard.h" |
18 #include "grit/chromium_strings.h" | 18 #include "grit/chromium_strings.h" |
(...skipping 158 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
177 help_link = l10n_util::GetStringUTF8(IDS_LEARN_MORE); | 177 help_link = l10n_util::GetStringUTF8(IDS_LEARN_MORE); |
178 break; | 178 break; |
179 default: | 179 default: |
180 if (login_attempts > 1) | 180 if (login_attempts > 1) |
181 help_link = l10n_util::GetStringUTF8(IDS_LEARN_MORE); | 181 help_link = l10n_util::GetStringUTF8(IDS_LEARN_MORE); |
182 break; | 182 break; |
183 } | 183 } |
184 | 184 |
185 webui_handler_->ShowError(login_attempts, error_text, help_link, | 185 webui_handler_->ShowError(login_attempts, error_text, help_link, |
186 help_topic_id); | 186 help_topic_id); |
187 accessibility::MaybeSpeak(error_text); | 187 AccessibilityManager::Get()->MaybeSpeak(error_text); |
188 } | 188 } |
189 | 189 |
190 void WebUILoginDisplay::ShowErrorScreen(LoginDisplay::SigninError error_id) { | 190 void WebUILoginDisplay::ShowErrorScreen(LoginDisplay::SigninError error_id) { |
191 VLOG(1) << "Show error screen, error_id: " << error_id; | 191 VLOG(1) << "Show error screen, error_id: " << error_id; |
192 if (!webui_handler_) | 192 if (!webui_handler_) |
193 return; | 193 return; |
194 webui_handler_->ShowErrorScreen(error_id); | 194 webui_handler_->ShowErrorScreen(error_id); |
195 } | 195 } |
196 | 196 |
197 void WebUILoginDisplay::ShowGaiaPasswordChanged(const std::string& username) { | 197 void WebUILoginDisplay::ShowGaiaPasswordChanged(const std::string& username) { |
(...skipping 175 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
373 base::TimeDelta::FromSeconds(kPasswordClearTimeoutSec), this, | 373 base::TimeDelta::FromSeconds(kPasswordClearTimeoutSec), this, |
374 &WebUILoginDisplay::OnPasswordClearTimerExpired); | 374 &WebUILoginDisplay::OnPasswordClearTimerExpired); |
375 } | 375 } |
376 | 376 |
377 void WebUILoginDisplay::OnPasswordClearTimerExpired() { | 377 void WebUILoginDisplay::OnPasswordClearTimerExpired() { |
378 if (webui_handler_) | 378 if (webui_handler_) |
379 webui_handler_->ClearUserPodPassword(); | 379 webui_handler_->ClearUserPodPassword(); |
380 } | 380 } |
381 | 381 |
382 } // namespace chromeos | 382 } // namespace chromeos |
OLD | NEW |