Revert "Pinch zoom is enabled by default"
This reverts commit 9d27a36fdd3727d7fdebe96fd24013bc601a58df.
BUG=chromium:631549
TEST=Manually tested and related regression tests are disbaled
Change-Id: Ia8c566eec84703a5d86ac9b4b019d51165b2281d
Reviewed-on: https://chromium-review.googlesource.com/363491
Commit-Ready: Amirhossein Simjour <asimjour@chromium.org>
Tested-by: Amirhossein Simjour <asimjour@chromium.org>
Reviewed-by: Andrew de los Reyes <adlr@chromium.org>
diff --git a/src/immediate_interpreter.cc b/src/immediate_interpreter.cc
index 39e2812..af953d2 100644
--- a/src/immediate_interpreter.cc
+++ b/src/immediate_interpreter.cc
@@ -1108,7 +1108,7 @@
pinch_guess_min_consistent_movement_(prop_reg,
"Pinch Guess Minimum Consistent Movement", 0.7),
pinch_zoom_min_events_(prop_reg, "Pinch Zoom Minimum Events", 7),
- pinch_enable_(prop_reg, "Pinch Enable", 1),
+ pinch_enable_(prop_reg, "Pinch Enable", 0),
right_click_start_time_diff_(prop_reg,
"Right Click Start Time Diff Thresh",
0.1),
diff --git a/src/immediate_interpreter_unittest.cc b/src/immediate_interpreter_unittest.cc
index e3a392b..ffa1162 100644
--- a/src/immediate_interpreter_unittest.cc
+++ b/src/immediate_interpreter_unittest.cc
@@ -1143,7 +1143,6 @@
TEST(ImmediateInterpreterTest, ThumbRetainTest) {
ImmediateInterpreter ii(NULL, NULL);
- ii.pinch_enable_.val_ = 0;
HardwareProperties hwprops = {
0, // left edge
0, // top edge
@@ -1285,7 +1284,6 @@
TEST(ImmediateInterpreterTest, AmbiguousPalmCoScrollTest) {
ImmediateInterpreter ii(NULL, NULL);
- ii.pinch_enable_.val_ = 0;
HardwareProperties hwprops = {
0, // left edge
0, // top edge
