Merge 22610 - Ensure that status bubble does not obscure download shelf....

chrome/browser/views/frame/browser_view.cc

Index: chrome/browser/views/frame/browser_view.cc
===================================================================
--- chrome/browser/views/frame/browser_view.cc	(revision 23148)
+++ chrome/browser/views/frame/browser_view.cc	(working copy)
@@ -872,15 +872,12 @@
   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
Property changes on: chrome\browser\views\frame\browser_view.cc
___________________________________________________________________
Modified: svn:mergeinfo
   Merged /trunk/src/chrome/browser/views/frame/browser_view.cc:r22610