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

Unified Diff: content/browser/renderer_host/render_widget_host_view_mac.mm

Issue 1888343002: Mac: Honour the user preference for triggering QuickLook with Force Click (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: be explicit Created 4 years, 8 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 | « no previous file | ui/base/cocoa/appkit_utils.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: content/browser/renderer_host/render_widget_host_view_mac.mm
diff --git a/content/browser/renderer_host/render_widget_host_view_mac.mm b/content/browser/renderer_host/render_widget_host_view_mac.mm
index 6cd3067aa74d11f04de0098a0c8d1ccbd84fc3bf..adfd6c87ab23a28a233090d378d7123a11bdc964 100644
--- a/content/browser/renderer_host/render_widget_host_view_mac.mm
+++ b/content/browser/renderer_host/render_widget_host_view_mac.mm
@@ -72,6 +72,7 @@
#include "third_party/WebKit/public/web/WebInputEvent.h"
#import "ui/base/clipboard/clipboard_util_mac.h"
#include "ui/base/cocoa/animation_utils.h"
+#import "ui/base/cocoa/appkit_utils.h"
#include "ui/base/cocoa/cocoa_base_utils.h"
#import "ui/base/cocoa/fullscreen_window_manager.h"
#import "ui/base/cocoa/underlay_opengl_hosting_window.h"
@@ -2312,7 +2313,8 @@ void RenderWidgetHostViewMac::OnDisplayMetricsChanged(
}
- (void)forceTouchEvent:(NSEvent*)theEvent {
- [self quickLookWithEvent:theEvent];
+ if (ui::ForceClickInvokesQuickLook())
+ [self quickLookWithEvent:theEvent];
}
- (void)shortCircuitScrollWheelEvent:(NSEvent*)event {
« no previous file with comments | « no previous file | ui/base/cocoa/appkit_utils.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698