content/browser/renderer_host/render_widget_host_view_mac.h - Issue 326403002: Merge ViewHostMsg_TextInputTypeChanged and ViewHostMsg_TextInputStateChanged into one.

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_view_mac.h

Issue 326403002: Merge ViewHostMsg_TextInputTypeChanged and ViewHostMsg_TextInputStateChanged into one. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: fixed. Created 6 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 | « content/browser/renderer_host/render_widget_host_view_base.h ('k') | content/browser/renderer_host/render_widget_host_view_mac.mm » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: content/browser/renderer_host/render_widget_host_view_mac.h

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

index 911b9e04b51d3139a12df2b625418fb4c5789117..6e55b31ecd3e564337e93f930ffbe194bd388c04 100644

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

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

@@ -30,6 +30,8 @@

#include "third_party/WebKit/public/web/WebCompositionUnderline.h"

#include "ui/base/cocoa/base_view.h"

+struct ViewHostMsg_TextInputState_Params;

namespace content {

class CompositingIOSurfaceMac;

class CompositingIOSurfaceContext;

@@ -271,9 +273,8 @@ class CONTENT_EXPORT RenderWidgetHostViewMac

virtual void Blur() OVERRIDE;

virtual void UpdateCursor(const WebCursor& cursor) OVERRIDE;

virtual void SetIsLoading(bool is_loading) OVERRIDE;

- virtual void TextInputTypeChanged(ui::TextInputType type,

- ui::TextInputMode input_mode,

- bool can_compose_inline) OVERRIDE;

+ virtual void TextInputStateChanged(

+ const ViewHostMsg_TextInputState_Params& params) OVERRIDE;

virtual void ImeCancelComposition() OVERRIDE;

virtual void ImeCompositionRangeChanged(

const gfx::Range& range,