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/input_method/input_method_configuration.h" | 9 #include "chrome/browser/chromeos/input_method/input_method_configuration.h" |
10 #include "chrome/browser/chromeos/input_method/input_method_manager.h" | 10 #include "chrome/browser/chromeos/input_method/input_method_manager.h" |
11 #include "chrome/browser/chromeos/login/login_display_host_impl.h" | 11 #include "chrome/browser/chromeos/login/login_display_host_impl.h" |
12 #include "chrome/browser/chromeos/login/screen_locker.h" | 12 #include "chrome/browser/chromeos/login/screen_locker.h" |
13 #include "chrome/browser/chromeos/login/wallpaper_manager.h" | 13 #include "chrome/browser/chromeos/login/wallpaper_manager.h" |
14 #include "chrome/browser/chromeos/login/webui_login_view.h" | 14 #include "chrome/browser/chromeos/login/webui_login_view.h" |
15 #include "chrome/browser/profiles/profile_manager.h" | 15 #include "chrome/browser/profiles/profile_manager.h" |
16 #include "chrome/browser/ui/browser_window.h" | 16 #include "chrome/browser/ui/browser_window.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 155 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
174 help_link = l10n_util::GetStringUTF8(IDS_LEARN_MORE); | 174 help_link = l10n_util::GetStringUTF8(IDS_LEARN_MORE); |
175 break; | 175 break; |
176 default: | 176 default: |
177 if (login_attempts > 1) | 177 if (login_attempts > 1) |
178 help_link = l10n_util::GetStringUTF8(IDS_LEARN_MORE); | 178 help_link = l10n_util::GetStringUTF8(IDS_LEARN_MORE); |
179 break; | 179 break; |
180 } | 180 } |
181 | 181 |
182 webui_handler_->ShowError(login_attempts, error_text, help_link, | 182 webui_handler_->ShowError(login_attempts, error_text, help_link, |
183 help_topic_id); | 183 help_topic_id); |
184 accessibility::MaybeSpeak(error_text); | 184 AccessibilityManager::Get()->MaybeSpeak(error_text); |
185 } | 185 } |
186 | 186 |
187 void WebUILoginDisplay::ShowErrorScreen(LoginDisplay::SigninError error_id) { | 187 void WebUILoginDisplay::ShowErrorScreen(LoginDisplay::SigninError error_id) { |
188 VLOG(1) << "Show error screen, error_id: " << error_id; | 188 VLOG(1) << "Show error screen, error_id: " << error_id; |
189 if (!webui_handler_) | 189 if (!webui_handler_) |
190 return; | 190 return; |
191 webui_handler_->ShowErrorScreen(error_id); | 191 webui_handler_->ShowErrorScreen(error_id); |
192 } | 192 } |
193 | 193 |
194 void WebUILoginDisplay::ShowGaiaPasswordChanged(const std::string& username) { | 194 void WebUILoginDisplay::ShowGaiaPasswordChanged(const std::string& username) { |
(...skipping 159 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
354 base::TimeDelta::FromSeconds(kPasswordClearTimeoutSec), this, | 354 base::TimeDelta::FromSeconds(kPasswordClearTimeoutSec), this, |
355 &WebUILoginDisplay::OnPasswordClearTimerExpired); | 355 &WebUILoginDisplay::OnPasswordClearTimerExpired); |
356 } | 356 } |
357 | 357 |
358 void WebUILoginDisplay::OnPasswordClearTimerExpired() { | 358 void WebUILoginDisplay::OnPasswordClearTimerExpired() { |
359 if (webui_handler_) | 359 if (webui_handler_) |
360 webui_handler_->ClearUserPodPassword(); | 360 webui_handler_->ClearUserPodPassword(); |
361 } | 361 } |
362 | 362 |
363 } // namespace chromeos | 363 } // namespace chromeos |
OLD | NEW |