Support IMM32 reconversion on Windows

views/ime/text_input_client.h

Index: views/ime/text_input_client.h
diff --git a/views/ime/text_input_client.h b/views/ime/text_input_client.h
index 35c595fc19718790945460d4eb5dcb5e866aaadf..42c1d01fc591e808be985ccb34e11cf22bf31c8a 100644
--- a/views/ime/text_input_client.h
+++ b/views/ime/text_input_client.h
@@ -9,7 +9,6 @@
 #include <vector>
 
 #include "base/basictypes.h"
-#include "base/callback.h"
 #include "base/string16.h"
 #include "ui/base/ime/composition_text.h"
 #include "ui/base/ime/text_input_type.h"
@@ -74,7 +73,8 @@ class VIEWS_EXPORT TextInputClient {
 
   // Document content operations ----------------------------------------------
 
-  // Retrieves the UTF-16 based character range containing all text in the View.
+  // Retrieves the UTF-16 based character range containing accessabled text in
+  // the View. It must cover the composition and selection range.
   // Returns false if the information cannot be retrieved right now.
   virtual bool GetTextRange(ui::Range* range) = 0;
 
@@ -98,12 +98,15 @@ class VIEWS_EXPORT TextInputClient {
   virtual bool DeleteRange(const ui::Range& range) = 0;
 
   // Retrieves the text content in a given UTF-16 based character range.
-  // The result will be send back to the input method by calling the given
-  // callback, which may happen asynchronously.
+  // If the given range is out of the text range, it returns the intersection
+  // of given range and text range. The result will be written in text and
+  // actual_range.
+  // Also see |GetTextRange()|.
   // Returns false if the operation is not supported.
   virtual bool GetTextFromRange(
       const ui::Range& range,
-      const base::Callback<void(const string16&)>& callback) = 0;
+      string16* text,
+      ui::Range* actual_range) = 0;
 
   // Miscellaneous ------------------------------------------------------------