| Index: ui/views/ime/input_method_bridge.h
|
| diff --git a/ui/views/ime/input_method_bridge.h b/ui/views/ime/input_method_bridge.h
|
| index 5e28a034b993b7dbe6f4e0f8e774bc0cd55778e8..3a70e88c7198c41d04d13d25a136fb41ac187d3c 100644
|
| --- a/ui/views/ime/input_method_bridge.h
|
| +++ b/ui/views/ime/input_method_bridge.h
|
| @@ -54,7 +54,7 @@ class InputMethodBridge : public InputMethodBase,
|
| 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;
|
| @@ -70,7 +70,7 @@ class InputMethodBridge : public InputMethodBase,
|
| 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;
|
|
|