summaryrefslogtreecommitdiffstats
path: root/ui/keyboard
diff options
context:
space:
mode:
authortfarina@chromium.org <tfarina@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2013-06-16 17:02:40 +0000
committertfarina@chromium.org <tfarina@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2013-06-16 17:02:40 +0000
commitf6af0366f158cf61b0fb5a7583e1822b80fc6634 (patch)
treea80e80f85b728edc17311fb25ce97fbf1bfda1ea /ui/keyboard
parent839afb3501771419364712c76f8ce005fb6bc4ed (diff)
downloadchromium_src-f6af0366f158cf61b0fb5a7583e1822b80fc6634.zip
chromium_src-f6af0366f158cf61b0fb5a7583e1822b80fc6634.tar.gz
chromium_src-f6af0366f158cf61b0fb5a7583e1822b80fc6634.tar.bz2
ui/keyboard: Use base::string16 now that string16 was moved into base namespace.
base/string16.h was moved into base namespace in r191198 by Brett. BUG=None TBR=ben@chromium.org,bryeung@chromium.org Review URL: https://chromiumcodereview.appspot.com/17185002 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@206643 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'ui/keyboard')
-rw-r--r--ui/keyboard/keyboard_controller_unittest.cc6
1 files changed, 3 insertions, 3 deletions
diff --git a/ui/keyboard/keyboard_controller_unittest.cc b/ui/keyboard/keyboard_controller_unittest.cc
index 1a970d4..6a6cb7f 100644
--- a/ui/keyboard/keyboard_controller_unittest.cc
+++ b/ui/keyboard/keyboard_controller_unittest.cc
@@ -115,8 +115,8 @@ class TestTextInputClient : public ui::TextInputClient {
const ui::CompositionText& composition) OVERRIDE {}
virtual void ConfirmCompositionText() OVERRIDE {}
virtual void ClearCompositionText() OVERRIDE {}
- virtual void InsertText(const string16& text) OVERRIDE {}
- virtual void InsertChar(char16 ch, int flags) OVERRIDE {}
+ virtual void InsertText(const base::string16& text) OVERRIDE {}
+ virtual void InsertChar(base::char16 ch, int flags) OVERRIDE {}
virtual gfx::NativeWindow GetAttachedWindow() const OVERRIDE {
return static_cast<gfx::NativeWindow>(NULL);
}
@@ -141,7 +141,7 @@ class TestTextInputClient : public ui::TextInputClient {
}
virtual bool DeleteRange(const ui::Range& range) OVERRIDE { return false; }
virtual bool GetTextFromRange(const ui::Range& range,
- string16* text) OVERRIDE {
+ base::string16* text) OVERRIDE {
return false;
}
virtual void OnInputMethodChanged() OVERRIDE {}