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

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

Issue 1955343002: Mac: Use a "less" private API for keeping traffic lights lit while bubbles are showing (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@20160509-MacViews-HasActiveAppearance-upstream
Patch Set: Add a comment Created 4 years, 7 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
Index: ui/views/cocoa/native_widget_mac_nswindow.mm
diff --git a/ui/views/cocoa/native_widget_mac_nswindow.mm b/ui/views/cocoa/native_widget_mac_nswindow.mm
index b93ee6f3d7b0891111c7a4a48660adb3b4c21000..70a3533f04fdf709ffba1ea70e1efa9ee5765b4f 100644
--- a/ui/views/cocoa/native_widget_mac_nswindow.mm
+++ b/ui/views/cocoa/native_widget_mac_nswindow.mm
@@ -12,6 +12,10 @@
#include "ui/views/widget/native_widget_mac.h"
#include "ui/views/widget/widget_delegate.h"
+@interface NSWindow (Private)
+- (BOOL)hasKeyAppearance;
+@end
+
@interface NativeWidgetMacNSWindow ()
- (ViewsNSWindowDelegate*)viewsNSWindowDelegate;
- (views::Widget*)viewsWidget;
@@ -91,10 +95,10 @@
}
// Lets the traffic light buttons on the parent window keep their active state.
-- (BOOL)_sharesParentKeyState {
- // Follow -canBecomeMainWindow unless the window provides its own buttons.
- return ([self styleMask] & NSClosableWindowMask) == 0 &&
- ![self canBecomeMainWindow];
+- (BOOL)hasKeyAppearance {
+ if ([self delegate] && [self viewsWidget]->IsAlwaysRenderAsActive())
+ return YES;
+ return [super hasKeyAppearance];
}
// Override sendEvent to allow key events to be forwarded to a toolkit-views
« no previous file with comments | « chrome/browser/ui/cocoa/chrome_browser_window.mm ('k') | ui/views/widget/native_widget_mac_interactive_uitest.mm » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698