summaryrefslogtreecommitdiffstats
path: root/ui/views/ime
diff options
context:
space:
mode:
authoravi@chromium.org <avi@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2013-12-25 21:57:26 +0000
committeravi@chromium.org <avi@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2013-12-25 21:57:26 +0000
commitc84c479fdf0ff331f11e17a9753686d21d2ee16b (patch)
tree5fee05ec877add08bc6d60cc0975ad5f4aa4f254 /ui/views/ime
parent76d5aab62bea96fdfc558cbecb52685ca1651870 (diff)
downloadchromium_src-c84c479fdf0ff331f11e17a9753686d21d2ee16b.zip
chromium_src-c84c479fdf0ff331f11e17a9753686d21d2ee16b.tar.gz
chromium_src-c84c479fdf0ff331f11e17a9753686d21d2ee16b.tar.bz2
Update some uses of char16 to use the base:: namespace.
BUG=329295 TEST=no change TBR=ben@chromium.org Review URL: https://codereview.chromium.org/111373008 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@242507 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'ui/views/ime')
-rw-r--r--ui/views/ime/input_method_bridge.cc2
-rw-r--r--ui/views/ime/input_method_bridge.h2
-rw-r--r--ui/views/ime/mock_input_method.cc2
3 files changed, 3 insertions, 3 deletions
diff --git a/ui/views/ime/input_method_bridge.cc b/ui/views/ime/input_method_bridge.cc
index e9bc459..fcc5916 100644
--- a/ui/views/ime/input_method_bridge.cc
+++ b/ui/views/ime/input_method_bridge.cc
@@ -198,7 +198,7 @@ void InputMethodBridge::InsertText(const base::string16& text) {
client->InsertText(text);
}
-void InputMethodBridge::InsertChar(char16 ch, int flags) {
+void InputMethodBridge::InsertChar(base::char16 ch, int flags) {
TextInputClient* client = GetTextInputClient();
if (client)
client->InsertChar(ch, flags);
diff --git a/ui/views/ime/input_method_bridge.h b/ui/views/ime/input_method_bridge.h
index 056c9a2..5c0e697 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,
virtual void ConfirmCompositionText() OVERRIDE;
virtual void ClearCompositionText() OVERRIDE;
virtual void InsertText(const base::string16& text) OVERRIDE;
- virtual void InsertChar(char16 ch, int flags) OVERRIDE;
+ virtual void InsertChar(base::char16 ch, int flags) OVERRIDE;
virtual gfx::NativeWindow GetAttachedWindow() const OVERRIDE;
virtual ui::TextInputType GetTextInputType() const OVERRIDE;
virtual ui::TextInputMode GetTextInputMode() const OVERRIDE;
diff --git a/ui/views/ime/mock_input_method.cc b/ui/views/ime/mock_input_method.cc
index a66ca5d..9188b74 100644
--- a/ui/views/ime/mock_input_method.cc
+++ b/ui/views/ime/mock_input_method.cc
@@ -88,7 +88,7 @@ void MockInputMethod::DispatchKeyEvent(const ui::KeyEvent& key) {
client->ClearCompositionText();
}
} else if (key.type() == ui::ET_KEY_PRESSED) {
- char16 ch = key.GetCharacter();
+ base::char16 ch = key.GetCharacter();
client->InsertChar(ch, key.flags());
}
}