Index: chrome/browser/chromeos/input_method/mock_input_method_manager.cc |
diff --git a/chrome/browser/chromeos/input_method/mock_input_method_manager.cc b/chrome/browser/chromeos/input_method/mock_input_method_manager.cc |
index 8c0594fcd8607bb6143ac603d39dd5a56d76fe1b..a4533a26c98d781e84b05f75f9258500258394e8 100644 |
--- a/chrome/browser/chromeos/input_method/mock_input_method_manager.cc |
+++ b/chrome/browser/chromeos/input_method/mock_input_method_manager.cc |
@@ -74,10 +74,10 @@ const InputMethodDescriptor* MockInputMethodManager::GetInputMethodFromId( |
void MockInputMethodManager::EnableLoginLayouts( |
const std::string& language_code, |
- const std::string& initial_layout) { |
+ const std::vector<std::string>& initial_layout) { |
} |
-bool MockInputMethodManager::EnableInputMethods( |
+bool MockInputMethodManager::ReplaceEnabledInputMethods( |
const std::vector<std::string>& new_active_input_method_ids) { |
return true; |
} |
@@ -111,7 +111,7 @@ void MockInputMethodManager::SetEnabledExtensionImes( |
std::vector<std::string>* ids) { |
} |
-void MockInputMethodManager::SetInputMethodDefault() { |
+void MockInputMethodManager::SetInputMethodLoginDefault() { |
} |
bool MockInputMethodManager::SwitchToNextInputMethod() { |
@@ -170,11 +170,6 @@ void MockInputMethodManager::set_application_locale(const std::string& value) { |
delegate_.set_active_locale(value); |
} |
-void MockInputMethodManager::set_hardware_keyboard_layout( |
- const std::string& value) { |
- delegate_.set_hardware_keyboard_layout(value); |
-} |
- |
bool MockInputMethodManager::IsLoginKeyboard( |
const std::string& layout) const { |
return true; |