Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(444)

Unified Diff: apps/shell_window.cc

Issue 134683004: Disabled pinch zooming in non-browser Aura windows. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 6 years, 11 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « apps/shell_window.h ('k') | chrome/browser/chromeos/first_run/first_run_view.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: apps/shell_window.cc
diff --git a/apps/shell_window.cc b/apps/shell_window.cc
index 9fef5c4ab5952cadf091bc40390c27aa856dc3aa..504cf17adc7ded597fa5688c6a28caafe38edd6f 100644
--- a/apps/shell_window.cc
+++ b/apps/shell_window.cc
@@ -347,6 +347,15 @@ void ShellWindow::RequestToLockMouse(WebContents* web_contents,
web_contents->GotResponseToLockMouseRequest(has_permission);
}
+bool ShellWindow::PreHandleGestureEvent(
+ WebContents* source,
+ const blink::WebGestureEvent& event) {
+ // Disable pinch zooming in shell windows.
+ return event.type == blink::WebGestureEvent::GesturePinchBegin ||
+ event.type == blink::WebGestureEvent::GesturePinchUpdate ||
+ event.type == blink::WebGestureEvent::GesturePinchEnd;
+}
+
void ShellWindow::DidFirstVisuallyNonEmptyPaint(int32 page_id) {
first_paint_complete_ = true;
if (show_on_first_paint_) {
« no previous file with comments | « apps/shell_window.h ('k') | chrome/browser/chromeos/first_run/first_run_view.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698