diff options
Diffstat (limited to 'chrome')
| -rw-r--r-- | chrome/browser/views/frame/browser_view.cc | 13 | ||||
| -rw-r--r-- | chrome/browser/views/status_bubble_views.cc | 3 |
2 files changed, 7 insertions, 9 deletions
diff --git a/chrome/browser/views/frame/browser_view.cc b/chrome/browser/views/frame/browser_view.cc index b85fec0..e1fbe6a 100644 --- a/chrome/browser/views/frame/browser_view.cc +++ b/chrome/browser/views/frame/browser_view.cc @@ -871,15 +871,12 @@ void BrowserView::SetDownloadShelfVisible(bool visible) { if (browser_ == NULL) return; - if (IsDownloadShelfVisible() != visible) { - if (visible) { - // Invoke GetDownloadShelf to force the shelf to be created. - GetDownloadShelf(); - } + if (visible && IsDownloadShelfVisible() != visible) + // Invoke GetDownloadShelf to force the shelf to be created. + GetDownloadShelf(); - if (browser_ != NULL) - browser_->UpdateDownloadShelfVisibility(visible); - } + if (browser_ != NULL) + browser_->UpdateDownloadShelfVisibility(visible); // SetDownloadShelfVisible can force-close the shelf, so make sure we lay out // everything correctly, as if the animation had finished. This doesn't diff --git a/chrome/browser/views/status_bubble_views.cc b/chrome/browser/views/status_bubble_views.cc index e6a03b9..439e938 100644 --- a/chrome/browser/views/status_bubble_views.cc +++ b/chrome/browser/views/status_bubble_views.cc @@ -632,7 +632,8 @@ void StatusBubbleViews::AvoidMouse() { 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); |