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/web/WebInputEvent.h" |
9 | 10 |
10 using content::BrowserContext; | 11 using content::BrowserContext; |
11 using content::OpenURLParams; | 12 using content::OpenURLParams; |
12 using content::WebContents; | 13 using content::WebContents; |
13 | 14 |
14 namespace ui { | 15 namespace ui { |
15 | 16 |
16 // Incognito profiles are not long-lived, so we always want to store a | 17 // Incognito profiles are not long-lived, so we always want to store a |
17 // non-incognito profile. | 18 // non-incognito profile. |
18 // | 19 // |
(...skipping 29 matching lines...) Expand all Loading... |
48 initial_pos, user_gesture); | 49 initial_pos, user_gesture); |
49 } | 50 } |
50 | 51 |
51 bool WebDialogWebContentsDelegate::IsPopupOrPanel( | 52 bool WebDialogWebContentsDelegate::IsPopupOrPanel( |
52 const WebContents* source) const { | 53 const WebContents* source) const { |
53 // 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 |
54 // contents. | 55 // contents. |
55 return true; | 56 return true; |
56 } | 57 } |
57 | 58 |
| 59 bool WebDialogWebContentsDelegate::PreHandleGestureEvent( |
| 60 WebContents* source, |
| 61 const blink::WebGestureEvent& event) { |
| 62 // Disable pinch zooming. |
| 63 return event.type == blink::WebGestureEvent::GesturePinchBegin || |
| 64 event.type == blink::WebGestureEvent::GesturePinchUpdate || |
| 65 event.type == blink::WebGestureEvent::GesturePinchEnd; |
| 66 } |
| 67 |
58 } // namespace ui | 68 } // namespace ui |
OLD | NEW |