Merge 22610 - Ensure that status bubble does not obscure 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 644 matching lines @@
                                      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() ||
         (download_shelf_is_visible_ &&
-         view_->GetStyle() == StatusView::STYLE_FLOATING)) {
+         (view_->GetStyle() == StatusView::STYLE_FLOATING ||
+          view_->GetStyle() == StatusView::STYLE_BOTTOM))) {
       // 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;
 
       // Substract border width + bubble width.
       int right_position_x = window_width - (position_.x() + size_.width());
       popup_->SetBounds(gfx::Rect(top_left.x() + right_position_x,
                                   top_left.y() + position_.y(),
                                   size_.width(), size_.height()));
     } else {
       offset_ = offset;
       popup_->SetBounds(gfx::Rect(top_left.x() + position_.x(),
                                   top_left.y() + position_.y() + offset_,
                                   size_.width(), size_.height()));
     }
   } else if (offset_ != 0 ||
       view_->GetStyle() == StatusView::STYLE_STANDARD_RIGHT) {
     offset_ = 0;
     view_->SetStyle(StatusView::STYLE_STANDARD);
     popup_->SetBounds(gfx::Rect(top_left.x() + position_.x(),
                                 top_left.y() + position_.y(),
                                 size_.width(), size_.height()));
   }
 }