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

Unified Diff: content/renderer/render_view.cc

Issue 7041003: Show composition text on IME panel when Pepper plugin is focused (Linux). (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Separated the preedit-needed flag to a different enum. Created 9 years, 6 months 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
Index: content/renderer/render_view.cc
diff --git a/content/renderer/render_view.cc b/content/renderer/render_view.cc
index 0d1e8e06135343697d8d0c522435b7a83ab9063f..078de7574e4e72023bf794117b73f8ff7d5c3eca 100644
--- a/content/renderer/render_view.cc
+++ b/content/renderer/render_view.cc
@@ -3977,16 +3977,26 @@ void RenderView::OnImeConfirmComposition(const string16& text) {
}
}
-WebKit::WebTextInputType RenderView::GetTextInputType() {
+ui::TextInputType RenderView::GetTextInputType() {
if (pepper_delegate_.IsPluginFocused()) {
// TODO(kinaba) Until PPAPI has an interface for handling IME events, we
// consider all the parts of PPAPI plugins are accepting text inputs.
- return WebKit::WebTextInputTypeText;
+ return ui::TEXT_INPUT_TYPE_TEXT;
} else {
return RenderWidget::GetTextInputType();
}
}
+ui::TextInputPreeditType RenderView::GetTextInputPreeditType() {
+ if (pepper_delegate_.IsPluginFocused()) {
+ // TODO(kinaba) Until PPAPI has an interface for handling IME events, we
+ // consider all the parts of PPAPI plugins are accepting text inputs.
+ return ui::TEXT_INPUT_PREEDIT_ON_CANDIDATE_WINDOW;
+ } else {
+ return ui::TEXT_INPUT_PREEDIT_INLINE;
+ }
+}
+
#if defined(OS_MACOSX)
void RenderView::PluginFocusChanged(bool focused, int plugin_id) {
IPC::Message* msg = new ViewHostMsg_PluginFocusChanged(routing_id(),

Powered by Google App Engine
This is Rietveld 408576698