summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--chrome/browser/chromeos/cros/input_method_library.cc7
-rw-r--r--chrome/browser/chromeos/cros/input_method_library.h3
2 files changed, 5 insertions, 5 deletions
diff --git a/chrome/browser/chromeos/cros/input_method_library.cc b/chrome/browser/chromeos/cros/input_method_library.cc
index d2d605a..103ea47 100644
--- a/chrome/browser/chromeos/cros/input_method_library.cc
+++ b/chrome/browser/chromeos/cros/input_method_library.cc
@@ -36,9 +36,6 @@ bool FindAndUpdateProperty(const chromeos::ImeProperty& new_prop,
return false;
}
-// The default keyboard layout.
-const char kDefaultKeyboardLayout[] = "us";
-
} // namespace
namespace chromeos {
@@ -684,8 +681,8 @@ class InputMethodLibraryStubImpl : public InputMethodLibrary {
descriptions->push_back(InputMethodDescriptor(
"xkb:gb:extd:eng", "United Kingdom - Extended - Winkeys", "gb(extd)",
"eng"));
- return descriptions;
-}
+ return descriptions;
+ }
InputMethodDescriptor previous_input_method_;
InputMethodDescriptor current_input_method_;
diff --git a/chrome/browser/chromeos/cros/input_method_library.h b/chrome/browser/chromeos/cros/input_method_library.h
index e4f45a7..2c07956 100644
--- a/chrome/browser/chromeos/cros/input_method_library.h
+++ b/chrome/browser/chromeos/cros/input_method_library.h
@@ -77,6 +77,9 @@ class InputMethodLibrary {
// the request and returns false.
// You can specify |section| and |config_name| arguments in the same way
// as GetImeConfig() above.
+ // Notice: This function might call the Observer::ActiveInputMethodsChanged()
+ // callback function immediately, before returning from the SetImeConfig
+ // function. See also http://crosbug.com/5217.
virtual bool SetImeConfig(const char* section,
const char* config_name,
const ImeConfigValue& value) = 0;