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

Side by Side Diff: content/browser/renderer_host/render_widget_host.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: A todo comment is reworded to be more correct. 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 unified diff | Download patch | Annotate | Revision Log
OLDNEW
1 // Copyright (c) 2011 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2011 The Chromium Authors. All rights reserved.
2 // Use of this source code is governed by a BSD-style license that can be 2 // Use of this source code is governed by a BSD-style license that can be
3 // found in the LICENSE file. 3 // found in the LICENSE file.
4 4
5 #include "content/browser/renderer_host/render_widget_host.h" 5 #include "content/browser/renderer_host/render_widget_host.h"
6 6
7 #include "base/auto_reset.h" 7 #include "base/auto_reset.h"
8 #include "base/command_line.h" 8 #include "base/command_line.h"
9 #include "base/debug/trace_event.h" 9 #include "base/debug/trace_event.h"
10 #include "base/i18n/rtl.h" 10 #include "base/i18n/rtl.h"
(...skipping 1014 matching lines...) Expand 10 before | Expand all | Expand 10 after
1025 } 1025 }
1026 1026
1027 void RenderWidgetHost::OnMsgSetCursor(const WebCursor& cursor) { 1027 void RenderWidgetHost::OnMsgSetCursor(const WebCursor& cursor) {
1028 if (!view_) { 1028 if (!view_) {
1029 return; 1029 return;
1030 } 1030 }
1031 view_->UpdateCursor(cursor); 1031 view_->UpdateCursor(cursor);
1032 } 1032 }
1033 1033
1034 void RenderWidgetHost::OnMsgImeUpdateTextInputState( 1034 void RenderWidgetHost::OnMsgImeUpdateTextInputState(
1035 WebKit::WebTextInputType type, 1035 ui::TextInputType type,
1036 bool can_compose_inline,
1036 const gfx::Rect& caret_rect) { 1037 const gfx::Rect& caret_rect) {
1037 if (view_) 1038 if (view_)
1038 view_->ImeUpdateTextInputState(type, caret_rect); 1039 view_->ImeUpdateTextInputState(type, can_compose_inline, caret_rect);
1039 } 1040 }
1040 1041
1041 void RenderWidgetHost::OnMsgImeCompositionRangeChanged(const ui::Range& range) { 1042 void RenderWidgetHost::OnMsgImeCompositionRangeChanged(const ui::Range& range) {
1042 if (view_) 1043 if (view_)
1043 view_->ImeCompositionRangeChanged(range); 1044 view_->ImeCompositionRangeChanged(range);
1044 } 1045 }
1045 1046
1046 void RenderWidgetHost::OnMsgImeCancelComposition() { 1047 void RenderWidgetHost::OnMsgImeCancelComposition() {
1047 if (view_) 1048 if (view_)
1048 view_->ImeCancelComposition(); 1049 view_->ImeCancelComposition();
(...skipping 128 matching lines...) Expand 10 before | Expand all | Expand 10 after
1177 view_->CreatePluginContainer(deferred_plugin_handles_[i]); 1178 view_->CreatePluginContainer(deferred_plugin_handles_[i]);
1178 #endif 1179 #endif
1179 } 1180 }
1180 1181
1181 deferred_plugin_handles_.clear(); 1182 deferred_plugin_handles_.clear();
1182 } 1183 }
1183 1184
1184 void RenderWidgetHost::StartUserGesture() { 1185 void RenderWidgetHost::StartUserGesture() {
1185 OnUserGesture(); 1186 OnUserGesture();
1186 } 1187 }
OLDNEW
« no previous file with comments | « content/browser/renderer_host/render_widget_host.h ('k') | content/browser/renderer_host/render_widget_host_view.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698