Disabled pinch zooming in non-browser Aura windows.

content/public/browser/web_contents_delegate.cc

 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "content/public/browser/web_contents_delegate.h"
 
 #include "base/compiler_specific.h"
 #include "base/logging.h"
 #include "base/memory/singleton.h"
 #include "content/public/browser/render_view_host.h"
 #include "content/public/browser/web_contents.h"
 #include "content/public/common/url_constants.h"
 #include "content/public/common/bindings_policy.h"
+#include "third_party/WebKit/public/web/WebInputEvent.h"
 #include "ui/gfx/rect.h"
 
 namespace content {
 
 WebContentsDelegate::WebContentsDelegate() {
 }
 
 WebContents* WebContentsDelegate::OpenURLFromTab(WebContents* source,
                                                  const OpenURLParams& params) {
   return NULL;
@@ skipping 79 matching lines @@
                                        PAGE_TRANSITION_LINK, false));
 }
 
 bool WebContentsDelegate::PreHandleKeyboardEvent(
     WebContents* source,
     const NativeWebKeyboardEvent& event,
     bool* is_keyboard_shortcut) {
   return false;
 }
 
+bool WebContentsDelegate::PreHandleGestureEvent(
+    WebContents* source,
+    const blink::WebGestureEvent& event) {
+  // By default, swallow pinch events

[sadrul, 2014/01/13 21:55:19]

This is only on desktop, right? So check !defined(OS_ANDROID)?

[bokan, 2014/01/13 22:45:09]

Yup. Added. I'm assuming Android doesn't use browser/ui/browser.cc and has it's
own implementation of WebContentsDelegate?

+  return event.type == blink::WebGestureEvent::GesturePinchBegin ||
+      event.type == blink::WebGestureEvent::GesturePinchUpdate ||
+      event.type == blink::WebGestureEvent::GesturePinchEnd;
+}
+
 bool WebContentsDelegate::CanDragEnter(
     WebContents* source,
     const DropData& data,
     blink::WebDragOperationsMask operations_allowed) {
   return true;
 }
 
 bool WebContentsDelegate::OnGoToEntryOffset(int offset) {
   return true;
 }
@@ skipping 61 matching lines @@
   DCHECK(attached_contents_.find(web_contents) != attached_contents_.end());
   attached_contents_.erase(web_contents);
 }
 
 gfx::Size WebContentsDelegate::GetSizeForNewRenderView(
     const WebContents* web_contents) const {
   return gfx::Size();
 }
 
 }  // namespace content