Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(80)

Unified Diff: views/ime/input_method_base.cc

Issue 8509034: Move views/ime/text_input_client.h to ui/base/ime/. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: more win_shared fix Created 9 years, 1 month ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « views/ime/input_method_base.h ('k') | views/ime/input_method_gtk.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: views/ime/input_method_base.cc
diff --git a/views/ime/input_method_base.cc b/views/ime/input_method_base.cc
index 6155ccd3c885093f80dfbe3484123d59d834f215..1fb0a15fb6615928f0f1193642f8017607f7fb25 100644
--- a/views/ime/input_method_base.cc
+++ b/views/ime/input_method_base.cc
@@ -2,6 +2,7 @@
// Use of this source code is governed by a BSD-style license that can be
// found in the LICENSE file.
+#include "ui/base/ime/text_input_client.h"
#include "views/ime/input_method_base.h"
#include "views/ime/text_input_type_tracker.h"
#include "views/view.h"
@@ -70,13 +71,13 @@ void InputMethodBase::OnTextInputTypeChanged(View* view) {
}
}
-TextInputClient* InputMethodBase::GetTextInputClient() const {
+ui::TextInputClient* InputMethodBase::GetTextInputClient() const {
return (widget_focused_ && GetFocusedView()) ?
GetFocusedView()->GetTextInputClient() : NULL;
}
ui::TextInputType InputMethodBase::GetTextInputType() const {
- TextInputClient* client = GetTextInputClient();
+ ui::TextInputClient* client = GetTextInputClient();
return client ? client->GetTextInputType() : ui::TEXT_INPUT_TYPE_NONE;
}
@@ -103,7 +104,7 @@ bool InputMethodBase::IsTextInputTypeNone() const {
}
void InputMethodBase::OnInputMethodChanged() const {
- TextInputClient* client = GetTextInputClient();
+ ui::TextInputClient* client = GetTextInputClient();
if (client && client->GetTextInputType() != ui::TEXT_INPUT_TYPE_NONE)
client->OnInputMethodChanged();
}
@@ -115,7 +116,7 @@ void InputMethodBase::DispatchKeyEventPostIME(const KeyEvent& key) const {
bool InputMethodBase::GetCaretBoundsInWidget(gfx::Rect* rect) const {
DCHECK(rect);
- TextInputClient* client = GetTextInputClient();
+ ui::TextInputClient* client = GetTextInputClient();
if (!client || client->GetTextInputType() == ui::TEXT_INPUT_TYPE_NONE)
return false;
« no previous file with comments | « views/ime/input_method_base.h ('k') | views/ime/input_method_gtk.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698