| OLD | NEW |
| 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/screens/chrome_user_selection_screen.h" |
| (...skipping 157 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 168 input_method::InputMethodManager* ime_manager = | 168 input_method::InputMethodManager* ime_manager = |
| 169 input_method::InputMethodManager::Get(); | 169 input_method::InputMethodManager::Get(); |
| 170 if (ime_manager->GetImeKeyboard()->CapsLockIsEnabled()) { | 170 if (ime_manager->GetImeKeyboard()->CapsLockIsEnabled()) { |
| 171 // TODO(ivankr): use a format string instead of concatenation. | 171 // TODO(ivankr): use a format string instead of concatenation. |
| 172 error_text += "\n" + | 172 error_text += "\n" + |
| 173 l10n_util::GetStringUTF8(IDS_LOGIN_ERROR_CAPS_LOCK_HINT); | 173 l10n_util::GetStringUTF8(IDS_LOGIN_ERROR_CAPS_LOCK_HINT); |
| 174 } | 174 } |
| 175 | 175 |
| 176 // Display a hint to switch keyboards if there are other active input | 176 // Display a hint to switch keyboards if there are other active input |
| 177 // methods. | 177 // methods. |
| 178 if (ime_manager->GetNumActiveInputMethods() > 1) { | 178 if (ime_manager->GetActiveIMEState()->GetNumActiveInputMethods() > 1) { |
| 179 error_text += "\n" + | 179 error_text += "\n" + |
| 180 l10n_util::GetStringUTF8(IDS_LOGIN_ERROR_KEYBOARD_SWITCH_HINT); | 180 l10n_util::GetStringUTF8(IDS_LOGIN_ERROR_KEYBOARD_SWITCH_HINT); |
| 181 } | 181 } |
| 182 } | 182 } |
| 183 | 183 |
| 184 std::string help_link; | 184 std::string help_link; |
| 185 switch (error_msg_id) { | 185 switch (error_msg_id) { |
| 186 case IDS_LOGIN_ERROR_AUTHENTICATING_HOSTED: | 186 case IDS_LOGIN_ERROR_AUTHENTICATING_HOSTED: |
| 187 help_link = l10n_util::GetStringUTF8(IDS_LEARN_MORE); | 187 help_link = l10n_util::GetStringUTF8(IDS_LEARN_MORE); |
| 188 break; | 188 break; |
| (...skipping 157 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 346 delegate_->Signout(); | 346 delegate_->Signout(); |
| 347 } | 347 } |
| 348 | 348 |
| 349 void WebUILoginDisplay::OnUserActivity(const ui::Event* event) { | 349 void WebUILoginDisplay::OnUserActivity(const ui::Event* event) { |
| 350 if (delegate_) | 350 if (delegate_) |
| 351 delegate_->ResetPublicSessionAutoLoginTimer(); | 351 delegate_->ResetPublicSessionAutoLoginTimer(); |
| 352 } | 352 } |
| 353 | 353 |
| 354 | 354 |
| 355 } // namespace chromeos | 355 } // namespace chromeos |
| OLD | NEW |