ui/keyboard/keyboard_controller.h - Issue 2666843003: Disable pinch-to-zoom gesture on virtual keyboard

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: ui/keyboard/keyboard_controller.h

Issue 2666843003: Disable pinch-to-zoom gesture on virtual keyboard (Closed)

Patch Set: add a comment Created 3 years, 11 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:

Index: ui/keyboard/keyboard_controller.h

diff --git a/ui/keyboard/keyboard_controller.h b/ui/keyboard/keyboard_controller.h

index 2bfe473f19d4b875dcb8b1192dc932a91f3d89dd..25369939bf8eef99235394d8d6988713ad17484b 100644

--- a/ui/keyboard/keyboard_controller.h

+++ b/ui/keyboard/keyboard_controller.h

@@ -14,6 +14,7 @@

#include "ui/base/ime/input_method_observer.h"

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

#include "ui/gfx/geometry/rect.h"

+#include "ui/keyboard/keyboard_event_filter.h"

#include "ui/keyboard/keyboard_export.h"

#include "ui/keyboard/keyboard_layout_delegate.h"

@@ -177,6 +178,7 @@ class KEYBOARD_EXPORT KeyboardController : public ui::InputMethodObserver,

bool keyboard_locked_;

KeyboardMode keyboard_mode_;

ui::TextInputType type_;

+ KeyboardEventFilter event_filter_;

bshe 2017/01/31 16:39:25 nit: consider use a unique_ptr

oshima 2017/01/31 21:06:53 this is actually fine if the lifetime is same as o

base::ObserverList<KeyboardControllerObserver> observer_list_;