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

Unified Diff: ui/views/cocoa/bridged_content_view.mm

Issue 659233002: STASH: Epic Experimental patch for toolkit-views App List on Mac Base URL: https://chromium.googlesource.com/chromium/src.git/+/master
Patch Set: Fix a few things. Works@master Created 6 years, 2 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 | « ui/views/bubble/bubble_delegate.cc ('k') | ui/views/cocoa/bridged_native_widget.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: ui/views/cocoa/bridged_content_view.mm
diff --git a/ui/views/cocoa/bridged_content_view.mm b/ui/views/cocoa/bridged_content_view.mm
index 3a772073c9ec86b15f16ccfbf56537f10f2b105d..53d64b7410543bdb88228357eea8fb8ab5058b39 100644
--- a/ui/views/cocoa/bridged_content_view.mm
+++ b/ui/views/cocoa/bridged_content_view.mm
@@ -77,6 +77,10 @@
// NSView implementation.
+- (BOOL)acceptsFirstMouse:(NSEvent*)theEvent {
+ return YES;
+}
+
- (BOOL)acceptsFirstResponder {
return YES;
}
@@ -92,7 +96,7 @@
- (void)drawRect:(NSRect)dirtyRect {
// Note that on a Show, Cocoa calls drawRect: before changing
// -[NSWindow isVisible], hence the extra check.
- if (!hostedView_ || (!willShow_ && ![[self window] isVisible]))
+ if (!hostedView_ || [self wantsLayer] || (!willShow_ && ![[self window] isVisible]))
return;
gfx::CanvasSkiaPaint canvas(dirtyRect, false /* opaque */);
« no previous file with comments | « ui/views/bubble/bubble_delegate.cc ('k') | ui/views/cocoa/bridged_native_widget.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698