| Index: chrome/browser/chromeos/first_run/first_run_view.cc
|
| diff --git a/chrome/browser/chromeos/first_run/first_run_view.cc b/chrome/browser/chromeos/first_run/first_run_view.cc
|
| index 211898f1eab483d0046b8356caea41d46512c470..8ee4c7179b81c7462e8fbc20fba130aa8396bc4f 100644
|
| --- a/chrome/browser/chromeos/first_run/first_run_view.cc
|
| +++ b/chrome/browser/chromeos/first_run/first_run_view.cc
|
| @@ -10,6 +10,7 @@
|
| #include "content/public/browser/render_view_host.h"
|
| #include "content/public/browser/render_widget_host_view.h"
|
| #include "content/public/browser/web_contents.h"
|
| +#include "third_party/WebKit/public/web/WebInputEvent.h"
|
| #include "third_party/skia/include/core/SkBitmap.h"
|
| #include "ui/views/controls/webview/webview.h"
|
| #include "url/gurl.h"
|
| @@ -60,5 +61,14 @@ bool FirstRunView::HandleContextMenu(
|
| return true;
|
| }
|
|
|
| +bool FirstRunView::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;
|
| +}
|
| +
|
| } // namespace chromeos
|
|
|
|
|