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

Unified Diff: chrome/browser/ui/cocoa/apps/native_app_window_cocoa.mm

Issue 550413002: Revert "Add AppWindow.setVisibleOnAllWorkspaces." (https://codereview.chromium.org/469993003) (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 6 years, 3 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: chrome/browser/ui/cocoa/apps/native_app_window_cocoa.mm
diff --git a/chrome/browser/ui/cocoa/apps/native_app_window_cocoa.mm b/chrome/browser/ui/cocoa/apps/native_app_window_cocoa.mm
index 757e36ca95d0619d32f0c1103a97de709e98d319..691de9aaefe05eb44cedc4c42d5447bd8069d532 100644
--- a/chrome/browser/ui/cocoa/apps/native_app_window_cocoa.mm
+++ b/chrome/browser/ui/cocoa/apps/native_app_window_cocoa.mm
@@ -60,15 +60,6 @@ void SetFullScreenCollectionBehavior(NSWindow* window, bool allow_fullscreen) {
[window setCollectionBehavior:behavior];
}
-void SetWorkspacesCollectionBehavior(NSWindow* window, bool always_visible) {
- NSWindowCollectionBehavior behavior = [window collectionBehavior];
- if (always_visible)
- behavior |= NSWindowCollectionBehaviorCanJoinAllSpaces;
- else
- behavior &= ~NSWindowCollectionBehaviorCanJoinAllSpaces;
- [window setCollectionBehavior:behavior];
-}
-
void InitCollectionBehavior(NSWindow* window) {
// Since always-on-top windows have a higher window level
// than NSNormalWindowLevel, they will default to
@@ -388,8 +379,6 @@ NativeAppWindowCocoa::NativeAppWindowCocoa(
[window setLevel:AlwaysOnTopWindowLevel()];
InitCollectionBehavior(window);
- SetWorkspacesCollectionBehavior(window, params.visible_on_all_workspaces);
-
window_controller_.reset(
[[NativeAppWindowController alloc] initWithWindow:window.release()]);
@@ -978,10 +967,6 @@ void NativeAppWindowCocoa::SetAlwaysOnTop(bool always_on_top) {
NSNormalWindowLevel)];
}
-void NativeAppWindowCocoa::SetVisibleOnAllWorkspaces(bool always_visible) {
- SetWorkspacesCollectionBehavior(window(), always_visible);
-}
-
NativeAppWindowCocoa::~NativeAppWindowCocoa() {
}
« no previous file with comments | « chrome/browser/ui/cocoa/apps/native_app_window_cocoa.h ('k') | chrome/browser/ui/views/apps/chrome_native_app_window_views.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698