| Index: ui/base/ime/dummy_text_input_client.h
|
| diff --git a/ui/base/ime/dummy_text_input_client.h b/ui/base/ime/dummy_text_input_client.h
|
| index 1242bb990d085b1271efe9f160ac7948f320840b..b2ebe641a3d0a5d6bd24a559a0e72f7b57971d18 100644
|
| --- a/ui/base/ime/dummy_text_input_client.h
|
| +++ b/ui/base/ime/dummy_text_input_client.h
|
| @@ -20,7 +20,7 @@ class DummyTextInputClient : public TextInputClient {
|
| const ui::CompositionText& composition) OVERRIDE;
|
| virtual void ConfirmCompositionText() OVERRIDE;
|
| virtual void ClearCompositionText() OVERRIDE;
|
| - virtual void InsertText(const string16& text) OVERRIDE;
|
| + virtual void InsertText(const base::string16& text) OVERRIDE;
|
| virtual void InsertChar(char16 ch, int flags) OVERRIDE;
|
| virtual gfx::NativeWindow GetAttachedWindow() const OVERRIDE;
|
| virtual ui::TextInputType GetTextInputType() const OVERRIDE;
|
| @@ -36,7 +36,7 @@ class DummyTextInputClient : public TextInputClient {
|
| virtual bool SetSelectionRange(const gfx::Range& range) OVERRIDE;
|
| virtual bool DeleteRange(const gfx::Range& range) OVERRIDE;
|
| virtual bool GetTextFromRange(const gfx::Range& range,
|
| - string16* text) const OVERRIDE;
|
| + base::string16* text) const OVERRIDE;
|
| virtual void OnInputMethodChanged() OVERRIDE;
|
| virtual bool ChangeTextDirectionAndLayoutAlignment(
|
| base::i18n::TextDirection direction) OVERRIDE;
|
|
|