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

Unified Diff: chrome/browser/chromeos/login/webui_login_display.cc

Issue 9264004: Make almost all public functions in XKeyboard pure virtual (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: rebase Created 8 years, 11 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 side-by-side diff with in-line comments
Download patch
Index: chrome/browser/chromeos/login/webui_login_display.cc
diff --git a/chrome/browser/chromeos/login/webui_login_display.cc b/chrome/browser/chromeos/login/webui_login_display.cc
index f770bd2e97f86ef082372d57df98a03bacc838fa..301005e70f59dad055089862dfede4e8b209aefa 100644
--- a/chrome/browser/chromeos/login/webui_login_display.cc
+++ b/chrome/browser/chromeos/login/webui_login_display.cc
@@ -4,6 +4,7 @@
#include "chrome/browser/chromeos/login/webui_login_display.h"
+#include "chrome/browser/chromeos/input_method/input_method_manager.h"
#include "chrome/browser/chromeos/input_method/xkeyboard.h"
#include "chrome/browser/chromeos/login/webui_login_view.h"
#include "chrome/browser/chromeos/login/wizard_accessibility_helper.h"
@@ -112,7 +113,9 @@ void WebUILoginDisplay::ShowError(int error_msg_id,
}
// Display a warning if Caps Lock is on and error is authentication-related.
- if (input_method::XKeyboard::CapsLockIsEnabled() &&
+ input_method::InputMethodManager* ime_manager =
+ input_method::InputMethodManager::GetInstance();
+ if (ime_manager->GetXKeyboard()->CapsLockIsEnabled() &&
error_msg_id != IDS_LOGIN_ERROR_WHITELIST) {
// TODO(ivankr): use a format string instead of concatenation.
error_text += "\n" +
« no previous file with comments | « chrome/browser/chromeos/login/screen_locker.cc ('k') | chrome/browser/chromeos/status/caps_lock_menu_button.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698