Upstream version 5.34.104.0

[platform/framework/web/crosswalk.git] / src / chrome / browser / chromeos / input_method / mock_input_method_manager.cc

diff --git a/src/chrome/browser/chromeos/input_method/mock_input_method_manager.cc b/src/chrome/browser/chromeos/input_method/mock_input_method_manager.cc
index d1d4bfc..a4533a2 100644 (file)
--- a/src/chrome/browser/chromeos/input_method/mock_input_method_manager.cc
+++ b/src/chrome/browser/chromeos/input_method/mock_input_method_manager.cc
@@ -72,11 +72,12 @@ const InputMethodDescriptor* MockInputMethodManager::GetInputMethodFromId(
   return NULL;
 }
 
-void MockInputMethodManager::EnableLayouts(const std::string& language_code,
-                                           const std::string& initial_layout) {
+void MockInputMethodManager::EnableLoginLayouts(
+    const std::string& language_code,
+    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;
 }
@@ -110,7 +111,7 @@ void MockInputMethodManager::SetEnabledExtensionImes(
     std::vector<std::string>* ids) {
 }
 
-void MockInputMethodManager::SetInputMethodDefault() {
+void MockInputMethodManager::SetInputMethodLoginDefault() {
 }
 
 bool MockInputMethodManager::SwitchToNextInputMethod() {
@@ -133,6 +134,7 @@ InputMethodDescriptor MockInputMethodManager::GetCurrentInputMethod() const {
   if (!current_input_method_id_.empty()) {
     return InputMethodDescriptor(current_input_method_id_,
                                  descriptor.name(),
+                                 descriptor.indicator(),
                                  descriptor.keyboard_layouts(),
                                  descriptor.language_codes(),
                                  true,
@@ -168,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;