Index: chrome/browser/chromeos/input_method/input_method_persistence.cc |
diff --git a/chrome/browser/chromeos/input_method/input_method_persistence.cc b/chrome/browser/chromeos/input_method/input_method_persistence.cc |
index c0c82fb008f3dc5b18c5679f708be2c287d173dd..00949b5b860cd9a69a14e5a7873cf50a70bc7f88 100644 |
--- a/chrome/browser/chromeos/input_method/input_method_persistence.cc |
+++ b/chrome/browser/chromeos/input_method/input_method_persistence.cc |
@@ -107,7 +107,7 @@ void PersistUserInputMethod(const std::string& input_method, |
InputMethodPersistence::InputMethodPersistence( |
InputMethodManager* input_method_manager) |
: input_method_manager_(input_method_manager), |
- state_(InputMethodManager::STATE_LOGIN_SCREEN) { |
+ ui_session_(InputMethodManager::STATE_LOGIN_SCREEN) { |
input_method_manager_->AddObserver(this); |
} |
@@ -121,7 +121,7 @@ void InputMethodPersistence::InputMethodChanged( |
const std::string current_input_method = |
manager->GetCurrentInputMethod().id(); |
// Save the new input method id depending on the current browser state. |
- switch (state_) { |
+ switch (ui_session_) { |
case InputMethodManager::STATE_LOGIN_SCREEN: |
if (!manager->IsLoginKeyboard(current_input_method)) { |
DVLOG(1) << "Only keyboard layouts are supported: " |
@@ -143,8 +143,8 @@ void InputMethodPersistence::InputMethodChanged( |
} |
void InputMethodPersistence::OnSessionStateChange( |
- InputMethodManager::State new_state) { |
- state_ = new_state; |
+ InputMethodManager::UISessionState new_ui_session) { |
+ ui_session_ = new_ui_session; |
} |
} // namespace input_method |