| 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 2fd14a2cd4eb0f31ddf3507e69457c6c14aa44d9..5eb4b5e7e44b8eb0f251b7d09224572987a9d284 100644
|
| --- a/ui/base/ime/text_input_client.h
|
| +++ b/ui/base/ime/text_input_client.h
|
| @@ -11,9 +11,9 @@
|
| #include "ui/base/ime/composition_text.h"
|
| #include "ui/base/ime/text_input_mode.h"
|
| #include "ui/base/ime/text_input_type.h"
|
| -#include "ui/base/range/range.h"
|
| #include "ui/base/ui_export.h"
|
| #include "ui/gfx/native_widget_types.h"
|
| +#include "ui/gfx/range/range.h"
|
|
|
| namespace gfx {
|
| class Rect;
|
| @@ -91,20 +91,20 @@ class UI_EXPORT TextInputClient {
|
| // Retrieves the UTF-16 based character range containing accessibled 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;
|
| + virtual bool GetTextRange(gfx::Range* range) = 0;
|
|
|
| // Retrieves the UTF-16 based character range of current composition text.
|
| // Returns false if the information cannot be retrieved right now.
|
| - virtual bool GetCompositionTextRange(ui::Range* range) = 0;
|
| + virtual bool GetCompositionTextRange(gfx::Range* range) = 0;
|
|
|
| // Retrieves the UTF-16 based character range of current selection.
|
| // Returns false if the information cannot be retrieved right now.
|
| - virtual bool GetSelectionRange(ui::Range* range) = 0;
|
| + virtual bool GetSelectionRange(gfx::Range* range) = 0;
|
|
|
| // Selects the given UTF-16 based character range. Current composition text
|
| // will be confirmed before selecting the range.
|
| // Returns false if the operation is not supported.
|
| - virtual bool SetSelectionRange(const ui::Range& range) = 0;
|
| + virtual bool SetSelectionRange(const gfx::Range& range) = 0;
|
|
|
| // Deletes contents in the given UTF-16 based character range. Current
|
| // composition text will be confirmed before deleting the range.
|
| @@ -114,13 +114,13 @@ class UI_EXPORT TextInputClient {
|
| // GetSelectionRange has a race condition due to asynchronous IPCs between
|
| // browser and renderer.
|
| // Returns false if the operation is not supported.
|
| - virtual bool DeleteRange(const ui::Range& range) = 0;
|
| + virtual bool DeleteRange(const gfx::Range& range) = 0;
|
|
|
| // Retrieves the text content in a given UTF-16 based character range.
|
| // 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 ui::Range& range, string16* text) = 0;
|
| + virtual bool GetTextFromRange(const gfx::Range& range, string16* text) = 0;
|
|
|
| // Miscellaneous ------------------------------------------------------------
|
|
|
|
|