Merge Chromium at 10.0.621.0: Initial merge by git.

Change-Id: I070cc91c608dfa4a968a5a54c173260765ac8097

1 files changed, 16 insertions, 7 deletions

diff --git a/chrome/browser/chromeos/cros/input_method_library.h b/chrome/browser/chromeos/cros/input_method_library.h
index f3bbe3c..c30db2f 100644
--- a/chrome/browser/chromeos/cros/input_method_library.h
+++ b/chrome/browser/chromeos/cros/input_method_library.h
@@ -12,7 +12,7 @@
 #include "base/observer_list.h"
 #include "base/time.h"
 #include "base/timer.h"
-#include "cros/chromeos_input_method.h"
+#include "third_party/cros/chromeos_input_method.h"
 
 namespace chromeos {
 
@@ -26,14 +26,23 @@ class InputMethodLibrary {
    public:
     virtual ~Observer() = 0;
     // Called when the current input method is changed.
-    virtual void InputMethodChanged(InputMethodLibrary* obj) = 0;
-
-    // Called when input method properties (see chromeos_input_method.h
-    // for details) are changed.
-    virtual void ImePropertiesChanged(InputMethodLibrary* obj) = 0;
+    virtual void InputMethodChanged(
+        InputMethodLibrary* obj,
+        const InputMethodDescriptor& previous_input_method,
+        const InputMethodDescriptor& current_input_method,
+        size_t num_active_input_methods) = 0;
 
     // Called when the active input methods are changed.
-    virtual void ActiveInputMethodsChanged(InputMethodLibrary* obj) = 0;
+    virtual void ActiveInputMethodsChanged(
+        InputMethodLibrary* obj,
+        const InputMethodDescriptor& current_input_method,
+        size_t num_active_input_methods) = 0;
+
+    // Called when the preferences have to be updated.
+    virtual void PreferenceUpdateNeeded(
+        InputMethodLibrary* obj,
+        const InputMethodDescriptor& previous_input_method,
+        const InputMethodDescriptor& current_input_method) = 0;
   };
   virtual ~InputMethodLibrary() {}