| Index: ui/base/ime/text_input_client.h
|
| diff --git a/ui/base/ime/text_input_client.h b/ui/base/ime/text_input_client.h
|
| index 35a6884e14672195f0a87395260b3f8ed5d20ebf..8623064f3c0e6f53da026a93ae82f010b1cf6016 100644
|
| --- a/ui/base/ime/text_input_client.h
|
| +++ b/ui/base/ime/text_input_client.h
|
| @@ -43,7 +43,7 @@ class UI_EXPORT TextInputClient {
|
| // Inserts a given text at the insertion point. Current composition text or
|
| // selection will be removed. This method should never be called when the
|
| // current text input type is TEXT_INPUT_TYPE_NONE.
|
| - virtual void InsertText(const string16& text) = 0;
|
| + virtual void InsertText(const base::string16& text) = 0;
|
|
|
| // Inserts a single char at the insertion point. Unlike above InsertText()
|
| // method, this method has an extra |flags| parameter indicating the modifier
|
| @@ -53,7 +53,7 @@ class UI_EXPORT TextInputClient {
|
| // preceding key press event should not be a VKEY_PROCESSKEY.
|
| // This method will be called whenever a char is generated by the keyboard,
|
| // even if the current text input type is TEXT_INPUT_TYPE_NONE.
|
| - virtual void InsertChar(char16 ch, int flags) = 0;
|
| + virtual void InsertChar(base::char16 ch, int flags) = 0;
|
|
|
| // Input context information -------------------------------------------------
|
|
|
| @@ -121,8 +121,8 @@ class UI_EXPORT TextInputClient {
|
| // The result will be stored into |*text|.
|
| // Returns false if the operation is not supported or the specified range
|
| // is out of the text range returned by GetTextRange().
|
| - virtual bool GetTextFromRange(
|
| - const gfx::Range& range, string16* text) const = 0;
|
| + virtual bool GetTextFromRange(const gfx::Range& range,
|
| + base::string16* text) const = 0;
|
|
|
| // Miscellaneous ------------------------------------------------------------
|
|
|
|
|