OLD | NEW |
1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. | 1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. |
2 // Use of this source code is governed by a BSD-style license that can be | 2 // Use of this source code is governed by a BSD-style license that can be |
3 // found in the LICENSE file. | 3 // found in the LICENSE file. |
4 | 4 |
5 #include "ui/web_dialogs/web_dialog_web_contents_delegate.h" | 5 #include "ui/web_dialogs/web_dialog_web_contents_delegate.h" |
6 | 6 |
7 #include "base/logging.h" | 7 #include "base/logging.h" |
8 #include "content/public/browser/web_contents.h" | 8 #include "content/public/browser/web_contents.h" |
9 #include "third_party/WebKit/public/platform/WebGestureEvent.h" | 9 #include "third_party/WebKit/public/platform/WebGestureEvent.h" |
10 | 10 |
(...skipping 42 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
53 const WebContents* source) const { | 53 const WebContents* source) const { |
54 // This needs to return true so that we are allowed to be resized by our | 54 // This needs to return true so that we are allowed to be resized by our |
55 // contents. | 55 // contents. |
56 return true; | 56 return true; |
57 } | 57 } |
58 | 58 |
59 bool WebDialogWebContentsDelegate::PreHandleGestureEvent( | 59 bool WebDialogWebContentsDelegate::PreHandleGestureEvent( |
60 WebContents* source, | 60 WebContents* source, |
61 const blink::WebGestureEvent& event) { | 61 const blink::WebGestureEvent& event) { |
62 // Disable pinch zooming. | 62 // Disable pinch zooming. |
63 return event.GetType() == blink::WebGestureEvent::kGesturePinchBegin || | 63 return blink::WebInputEvent::IsPinchGestureEventType(event.GetType()); |
64 event.GetType() == blink::WebGestureEvent::kGesturePinchUpdate || | |
65 event.GetType() == blink::WebGestureEvent::kGesturePinchEnd; | |
66 } | 64 } |
67 | 65 |
68 } // namespace ui | 66 } // namespace ui |
OLD | NEW |