Fixes the problem of the status bubble obscuring the download shelf....

chrome/browser/views/status_bubble_views.cc

 // Copyright (c) 2006-2008 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/views/status_bubble_views.h"
 
 #include <algorithm>
 
 #include "app/gfx/canvas.h"
 #include "app/gfx/text_elider.h"
@@ skipping 440 matching lines @@
 
 // StatusBubble ---------------------------------------------------------------
 
 const int StatusBubbleViews::kShadowThickness = 1;
 
 StatusBubbleViews::StatusBubbleViews(views::Widget* frame)
     : offset_(0),
       popup_(NULL),
       opacity_(0),
       frame_(frame),
-      view_(NULL) {
+      view_(NULL),
+      download_shelf_is_visible_(false) {
 }
 
 StatusBubbleViews::~StatusBubbleViews() {
   if (popup_.get())
     popup_->CloseNow();
 }
 
 void StatusBubbleViews::Init() {
   if (!popup_.get()) {
 #if defined(OS_WIN)
@@ skipping 75 matching lines @@
     view_->ResetTimer();
 
     if (view_->GetState() != StatusView::BUBBLE_HIDDEN &&
         view_->GetState() != StatusView::BUBBLE_HIDING_FADE &&
         view_->GetState() != StatusView::BUBBLE_HIDING_TIMER) {
       AvoidMouse();
     }
   }
 }
 
+void StatusBubbleViews::UpdateDownloadShelfVisibility(bool visible) {
+  download_shelf_is_visible_ = visible;
+}
+
 void StatusBubbleViews::AvoidMouse() {
   // Our status bubble is located in screen coordinates, so we should get
   // those rather than attempting to reverse decode the web contents
   // coordinates.
   gfx::Point cursor_location;
 #if defined(OS_WIN)
   POINT tmp = { 0, 0 };
   GetCursorPos(&tmp);
   cursor_location = tmp;
 #else
@@ skipping 32 matching lines @@
     // and mate to the edges of the tab content).
     if (offset >= size_.height() - kShadowThickness * 2) {
       offset = size_.height() - kShadowThickness * 2;
       view_->SetStyle(StatusView::STYLE_BOTTOM);
     } else if (offset > kBubbleCornerRadius / 2 - kShadowThickness) {
       view_->SetStyle(StatusView::STYLE_FLOATING);
     } else {
       view_->SetStyle(StatusView::STYLE_STANDARD);
     }
 
-    // Check if the bubble sticks out from the monitor.
+    // Check if the bubble sticks out from the monitor or will obscure
+    // download shelf.
 #if defined(OS_WIN)
     MONITORINFO monitor_info;
     monitor_info.cbSize = sizeof(monitor_info);
     GetMonitorInfo(MonitorFromWindow(frame_->GetNativeView(),
                                      MONITOR_DEFAULTTONEAREST), &monitor_info);
     gfx::Rect monitor_rect(monitor_info.rcWork);
 #else
     gfx::Rect monitor_rect;
     NOTIMPLEMENTED();
 #endif
     const int bubble_bottom_y = top_left.y() + position_.y() + size_.height();
 
-    if (bubble_bottom_y + offset > monitor_rect.height()) {
+    if (bubble_bottom_y + offset > monitor_rect.height() ||
+        (download_shelf_is_visible_ &&
+         view_->GetStyle() == StatusView::STYLE_FLOATING)) {
       // The offset is still too large. Move the bubble to the right and reset
       // Y offset_ to zero.
       view_->SetStyle(StatusView::STYLE_STANDARD_RIGHT);
       offset_ = 0;
 
       int root_width = root->GetLocalBounds(true).width();  // border included.
       // Substract border width + bubble width.
       int right_position_x = root_width - (position_.x() + size_.width());
       popup_->SetBounds(gfx::Rect(top_left.x() + right_position_x,
                                   top_left.y() + position_.y(),
@@ skipping 33 matching lines @@
     frame_->GetBounds(&frame_bounds, false);
     int mirrored_x = frame_bounds.width() - x - w;
     position_.SetPoint(mirrored_x, y);
   } else {
     position_.SetPoint(x, y);
   }
 
   size_.SetSize(w, h);
   Reposition();
 }