Chromium Code Reviews| Index: content/browser/web_contents/web_contents_impl_unittest.cc |
| diff --git a/content/browser/web_contents/web_contents_impl_unittest.cc b/content/browser/web_contents/web_contents_impl_unittest.cc |
| index eb35542160a5d5a5a39e5ed5fa91fb3f5d94e7e9..6d8c12ec018adbeaa398d18da602cccf9327e870 100644 |
| --- a/content/browser/web_contents/web_contents_impl_unittest.cc |
| +++ b/content/browser/web_contents/web_contents_impl_unittest.cc |
| @@ -2822,20 +2822,12 @@ TEST_F(WebContentsImplTest, HandleWheelEvent) { |
| EXPECT_FALSE(contents()->HandleWheelEvent(event)); |
| EXPECT_EQ(0, delegate->GetAndResetContentsZoomChangedCallCount()); |
| - modifiers = WebInputEvent::ShiftKey | WebInputEvent::AltKey | |
| - WebInputEvent::ControlKey; |
| - event = |
| - SyntheticWebMouseWheelEventBuilder::Build(0, 0, 0, 1, modifiers, false); |
| - EXPECT_FALSE(contents()->HandleWheelEvent(event)); |
| - EXPECT_EQ(0, delegate->GetAndResetContentsZoomChangedCallCount()); |
| - |
| // But whenever the ctrl modifier is applied with canScroll=false, they can |
|
tdresser
2016/06/10 18:06:46
Update comment.
dtapuska
2016/06/10 19:11:17
Done.
|
| // increase/decrease zoom. Except on MacOS where we never want to adjust zoom |
| // with mousewheel. |
| modifiers = WebInputEvent::ControlKey; |
| event = |
| SyntheticWebMouseWheelEventBuilder::Build(0, 0, 0, 1, modifiers, false); |
| - event.canScroll = false; |
| bool handled = contents()->HandleWheelEvent(event); |
| #if defined(OS_MACOSX) |
| EXPECT_FALSE(handled); |
| @@ -2850,7 +2842,6 @@ TEST_F(WebContentsImplTest, HandleWheelEvent) { |
| WebInputEvent::AltKey; |
| event = |
| SyntheticWebMouseWheelEventBuilder::Build(0, 0, 2, -5, modifiers, false); |
| - event.canScroll = false; |
| handled = contents()->HandleWheelEvent(event); |
| #if defined(OS_MACOSX) |
| EXPECT_FALSE(handled); |