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

Unified Diff: chrome/browser/ui/cocoa/panels/panel_window_controller_cocoa.mm

Issue 12430013: Fix panel showing logic when Chrome enters the fullscreen mode (Closed) Base URL: http://git.chromium.org/chromium/src.git@master
Patch Set: Fix per feedback Created 7 years, 9 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 | « chrome/browser/ui/cocoa/panels/panel_cocoa.mm ('k') | chrome/browser/ui/panels/display_settings_provider.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/browser/ui/cocoa/panels/panel_window_controller_cocoa.mm
diff --git a/chrome/browser/ui/cocoa/panels/panel_window_controller_cocoa.mm b/chrome/browser/ui/cocoa/panels/panel_window_controller_cocoa.mm
index f28d1a71bdbfd124d5649925b56c35faf508ebb4..9f92923237f624bb09849489e0017288de86b064 100644
--- a/chrome/browser/ui/cocoa/panels/panel_window_controller_cocoa.mm
+++ b/chrome/browser/ui/cocoa/panels/panel_window_controller_cocoa.mm
@@ -849,9 +849,14 @@ NSCursor* LoadWebKitCursor(WebKit::WebCursorInfo::Type type) {
- (void)fullScreenModeChanged:(bool)isFullScreen {
[self updateWindowLevel];
- // The full-screen window is in normal level and changing the panel window to
- // same normal level will not move it below the full-screen window. Thus we
- // need to reorder the panel window.
+ // If the panel is not always on top, its z-order should not be affected if
+ // some other window enters fullscreen mode.
+ if (!windowShim_->panel()->IsAlwaysOnTop())
+ return;
+
+ // The full-screen window is in normal level and changing the panel window
+ // to same normal level will not move it below the full-screen window. Thus
+ // we need to reorder the panel window.
if (isFullScreen)
[[self window] orderBack:nil];
else
« no previous file with comments | « chrome/browser/ui/cocoa/panels/panel_cocoa.mm ('k') | chrome/browser/ui/panels/display_settings_provider.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698