content/browser/renderer_host/render_widget_host.h - Issue 7041003: Show composition text on IME panel when Pepper plugin is focused (Linux).

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

Unified Diff: content/browser/renderer_host/render_widget_host.h

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: nit fix 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

« no previous file with comments | « chrome/browser/renderer_host/render_widget_host_view_win.cc ('k') | content/browser/renderer_host/render_widget_host.cc » ('j') | content/renderer/render_view.cc » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: content/browser/renderer_host/render_widget_host.h

diff --git a/content/browser/renderer_host/render_widget_host.h b/content/browser/renderer_host/render_widget_host.h

index 1bf0ca78599650d3402b5bb6e94f1d4fe6c911e6..f27d85153f6247ffea32fec1f564e7be10f1cbc8 100644

--- a/content/browser/renderer_host/render_widget_host.h

+++ b/content/browser/renderer_host/render_widget_host.h

@@ -20,7 +20,7 @@

#include "ipc/ipc_channel.h"

#include "third_party/WebKit/Source/WebKit/chromium/public/WebInputEvent.h"

#include "third_party/WebKit/Source/WebKit/chromium/public/WebTextDirection.h"

-#include "third_party/WebKit/Source/WebKit/chromium/public/WebTextInputType.h"

+#include "ui/base/ime/text_input_type.h"

#include "ui/gfx/native_widget_types.h"

#include "ui/gfx/rect.h"

#include "ui/gfx/size.h"

@@ -455,7 +455,8 @@ class RenderWidgetHost : public IPC::Channel::Listener,

virtual void OnMsgBlur();

void OnMsgSetCursor(const WebCursor& cursor);

- void OnMsgImeUpdateTextInputState(WebKit::WebTextInputType type,

+ void OnMsgImeUpdateTextInputState(ui::TextInputType type,

+ bool can_compose_inline,

const gfx::Rect& caret_rect);

void OnMsgImeCompositionRangeChanged(const ui::Range& range);

void OnMsgImeCancelComposition();