Index: chrome/browser/extensions/extension_view_host.cc |
diff --git a/chrome/browser/extensions/extension_view_host.cc b/chrome/browser/extensions/extension_view_host.cc |
index 9eb6d79889a3397980a4227b60bb13bb8c51829c..3c86e27adcd45ed486e08b2b99a093f8c0c825c9 100644 |
--- a/chrome/browser/extensions/extension_view_host.cc |
+++ b/chrome/browser/extensions/extension_view_host.cc |
@@ -21,6 +21,7 @@ |
#include "extensions/browser/runtime_data.h" |
#include "extensions/common/extension_messages.h" |
#include "grit/browser_resources.h" |
+#include "third_party/WebKit/public/web/WebInputEvent.h" |
#include "ui/base/resource/resource_bundle.h" |
#include "ui/events/keycodes/keyboard_codes.h" |
@@ -222,6 +223,15 @@ void ExtensionViewHost::HandleKeyboardEvent( |
UnhandledKeyboardEvent(source, event); |
} |
+bool ExtensionViewHost::PreHandleGestureEvent( |
+ content::WebContents* source, |
+ const blink::WebGestureEvent& event) { |
+ // Disable pinch zooming. |
+ return event.type == blink::WebGestureEvent::GesturePinchBegin || |
+ event.type == blink::WebGestureEvent::GesturePinchUpdate || |
+ event.type == blink::WebGestureEvent::GesturePinchEnd; |
+} |
+ |
content::ColorChooser* ExtensionViewHost::OpenColorChooser( |
WebContents* web_contents, |
SkColor initial_color, |