[Mac] Fix "Chrome windows use more 'hidden' space on Exposé/Mission Control".

chrome/browser/ui/cocoa/status_bubble_mac.mm

 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "chrome/browser/ui/cocoa/status_bubble_mac.h"
 
 #include <limits>
 
 #include "base/bind.h"
 #include "base/compiler_specific.h"
@@ skipping 100 matching lines @@
   Create();
   Attach();
 }
 
 StatusBubbleMac::~StatusBubbleMac() {
   DCHECK(window_);
 
   Hide();
 
   [[[window_ animationForKey:kFadeAnimationKey] delegate] invalidate];
-  Detach();
+  if (is_attached())

[Mark Mentovai, 2012/04/23 17:59:36]

Why not move this logic into Detach()?

Detach() is private and only called from within this class, and you’ve already
placed identical logic at each call site.

[asvitkine_google, 2012/04/23 18:06:24]

Done.

+    Detach();
   [window_ release];
   window_ = nil;
 }
 
 void StatusBubbleMac::SetStatus(const string16& status) {
   SetText(status, false);
 }
 
 void StatusBubbleMac::SetURL(const GURL& url, const std::string& languages) {
   url_ = url;
@@ skipping 274 matching lines @@
 void StatusBubbleMac::Attach() {
   DCHECK(!is_attached());
 
   [window_ orderFront:nil];
   [parent_ addChildWindow:window_ ordered:NSWindowAbove];
 
   [[window_ contentView] setThemeProvider:parent_];
 }
 
 void StatusBubbleMac::Detach() {
   DCHECK(is_attached());

[Mark Mentovai, 2012/04/23 17:59:36]

Is this DCHECK no longer correct (given the change you’re making/may make)?

[asvitkine_google, 2012/04/23 18:06:24]

Done.

 
   // Magic setFrame: See crbug.com/58506, and codereview.chromium.org/3564021
   [window_ setFrame:CalculateWindowFrame(/*expand=*/false) display:NO];
   [parent_ removeChildWindow:window_];  // See crbug.com/28107 ...
   [window_ orderOut:nil];               // ... and crbug.com/29054.
 
   [[window_ contentView] setThemeProvider:nil];
 }
 
 void StatusBubbleMac::AnimationDidStop(CAAnimation* animation, bool finished) {
@@ skipping 13 matching lines @@
       DCHECK_EQ([[window_ animator] alphaValue], 0.0);
       SetState(kBubbleHidden);
     }
   }
 }
 
 void StatusBubbleMac::SetState(StatusBubbleState state) {
   if (state == state_)
     return;
 
-  if (state == kBubbleHidden)
-    [window_ setFrame:NSMakeRect(0, 0, 1, 1) display:YES];
+  if (state == kBubbleHidden) {

[sail, 2012/04/23 18:08:53]

Hi Alexei. I think this change might reintroduce bug 54924.

In r77090 I changed the bubble so that it always remains attached. It seems like
attaching/reattaching causes a lot of things to mess up.

You should also check if you regress bugs 31821 and 61629.

[sail, 2012/04/23 18:10:22]

Also, you may decide that regressing the above bugs is an ok trade off in
exchange for fixing the expose bug.

I don't really have an opinion on that, it's your call.

+    if (is_attached())
+      Detach();
+  } else if (!is_attached()) {
+    Attach();
+  }
 
   if ([delegate_ respondsToSelector:@selector(statusBubbleWillEnterState:)])
     [delegate_ statusBubbleWillEnterState:state];
 
   state_ = state;
 }
 
 void StatusBubbleMac::Fade(bool show) {
   DCHECK([NSThread isMainThread]);
 
@@ skipping 211 matching lines @@
     return;
 
   SetFrameAvoidingMouse(CalculateWindowFrame(/*expand=*/false),
                         GetMouseLocation());
 }
 
 void StatusBubbleMac::SwitchParentWindow(NSWindow* parent) {
   DCHECK(parent);
   DCHECK(is_attached());
 
-  Detach();
+  if (is_attached())
+    Detach();
   parent_ = parent;
   Attach();
   UpdateSizeAndPosition();
 }
 
 NSRect StatusBubbleMac::CalculateWindowFrame(bool expanded_width) {
   DCHECK(parent_);
 
   NSRect screenRect;
   if ([delegate_ respondsToSelector:@selector(statusBubbleBaseFrame)]) {
@@ skipping 36 matching lines @@
     }
 
     // Round the top corners when the bubble is below the parent window.
     if (NSMinY(window_frame) < NSMinY(parent_frame)) {
       corner_flags |= kRoundedTopLeftCorner | kRoundedTopRightCorner;
     }
   }
 
   return corner_flags;
 }