Index: chrome/browser/devtools/devtools_window.cc |
diff --git a/chrome/browser/devtools/devtools_window.cc b/chrome/browser/devtools/devtools_window.cc |
index 7dd7282737deb433b1c653cc760fb55ef1a20873..496b2172b13a5878a4b747343cfe753ccc137825 100644 |
--- a/chrome/browser/devtools/devtools_window.cc |
+++ b/chrome/browser/devtools/devtools_window.cc |
@@ -66,6 +66,7 @@ |
#include "content/public/common/url_constants.h" |
#include "extensions/common/extension_set.h" |
#include "grit/generated_resources.h" |
+#include "third_party/WebKit/public/web/WebInputEvent.h" |
#include "ui/base/l10n/l10n_util.h" |
using base::DictionaryValue; |
@@ -939,6 +940,15 @@ void DevToolsWindow::WebContentsFocused(content::WebContents* contents) { |
inspected_browser->window()->WebContentsFocused(contents); |
} |
+bool DevToolsWindow::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; |
+} |
+ |
void DevToolsWindow::DispatchOnEmbedder(const std::string& message) { |
std::string method; |
base::ListValue empty_params; |