Committing original patch http://codereview.chromium.org/178036...

chrome/browser/cocoa/status_bubble_mac.mm

 // Copyright (c) 2009 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/cocoa/status_bubble_mac.h"
 
 #include "app/gfx/text_elider.h"
 #include "base/string_util.h"
 #include "base/sys_string_conversions.h"
 #import "chrome/browser/cocoa/bubble_view.h"
@@ skipping 109 matching lines @@
   if (!window_)
     return;
 
   NSPoint cursor_location = [NSEvent mouseLocation];
   --cursor_location.y;  // docs say the y coord starts at 1 not 0; don't ask why
 
   // Get the normal position of the frame.
   NSRect window_frame = [window_ frame];
   window_frame.origin = [parent_ frame].origin;
 
+  // Adjust the position to sit on top of download shelf.
+  // |delegate_| can be nil during unit tests.
+  if (is_download_shelf_visible_) {
+    if ([delegate_ respondsToSelector:@selector(verticalOffsetForStatusBubble)])
+      window_frame.origin.y += [delegate_ verticalOffsetForStatusBubble];
+  }
+
   // Get the cursor position relative to the popup.
   cursor_location.x -= NSMaxX(window_frame);
   cursor_location.y -= NSMaxY(window_frame);
 
   // If the mouse is in a position where we think it would move the
   // status bubble, figure out where and how the bubble should be moved.
   if (cursor_location.y < kMousePadding &&
       cursor_location.x < kMousePadding) {
     int offset = kMousePadding - cursor_location.y;
 
@@ skipping 21 matching lines @@
       [[window_ contentView] setCornerFlags:kRoundedTopRightCorner];
     }
 
     offset_ = offset;
     window_frame.origin.y -= offset;
   } else {
     offset_ = 0;
     [[window_ contentView] setCornerFlags:kRoundedTopRightCorner];
   }
 
-  // |delegate_| can be nil during unit tests.
-  if (is_download_shelf_visible_) {
-    if ([delegate_ respondsToSelector:@selector(verticalOffsetForStatusBubble)])
-      window_frame.origin.y += [delegate_ verticalOffsetForStatusBubble];
-  }
-
   [window_ setFrame:window_frame display:YES];
 }
 
 void StatusBubbleMac::UpdateDownloadShelfVisibility(bool visible) {
   is_download_shelf_visible_ = visible;
 }
 
 void StatusBubbleMac::Create() {
   if (window_)
     return;
@@ skipping 36 matching lines @@
   [NSAnimationContext endGrouping];
 }
 
 void StatusBubbleMac::FadeOut() {
   [NSAnimationContext beginGrouping];
   [[NSAnimationContext currentContext] setDuration:kHideFadeDuration];
   [[window_ animator] setAlphaValue:0.0f];
   [NSAnimationContext endGrouping];
 }