chrome/browser/renderer_host/render_widget_host_view_mac.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: chrome/browser/renderer_host/render_widget_host_view_mac.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_gtk.cc ('k') | chrome/browser/renderer_host/render_widget_host_view_mac.mm » ('j') | content/renderer/render_view.cc » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: chrome/browser/renderer_host/render_widget_host_view_mac.h

diff --git a/chrome/browser/renderer_host/render_widget_host_view_mac.h b/chrome/browser/renderer_host/render_widget_host_view_mac.h

index 6658396b712b3f548784c636d01f5224ced6db42..923e40134e188a6e20eff4c2b5639403b906a443 100644

--- a/chrome/browser/renderer_host/render_widget_host_view_mac.h

+++ b/chrome/browser/renderer_host/render_widget_host_view_mac.h

@@ -192,7 +192,8 @@ class RenderWidgetHostViewMac : public RenderWidgetHostView {

virtual gfx::Rect GetViewBounds() const OVERRIDE;

virtual void UpdateCursor(const WebCursor& cursor) OVERRIDE;

virtual void SetIsLoading(bool is_loading) OVERRIDE;

- virtual void ImeUpdateTextInputState(WebKit::WebTextInputType state,

+ virtual void ImeUpdateTextInputState(ui::TextInputType state,

+ bool can_compose_inline,

const gfx::Rect& caret_rect) OVERRIDE;

virtual void ImeCancelComposition() OVERRIDE;

virtual void ImeCompositionRangeChanged(const ui::Range& range) OVERRIDE;

@@ -331,7 +332,7 @@ class RenderWidgetHostViewMac : public RenderWidgetHostView {

base::TimeTicks tab_switch_paint_time_;

// Current text input type.

- WebKit::WebTextInputType text_input_type_;

+ ui::TextInputType text_input_type_;

typedef std::map<gfx::PluginWindowHandle, AcceleratedPluginView*>

PluginViewMap;