Fix bug where a shelf or infobar would not be closed correctly when closing a...

chrome/browser/views/old_frames/vista_frame.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/old_frames/vista_frame.h"
 
 #include <windows.h>
 #include <atlbase.h>
 #include <atlapp.h>
 #include <atltheme.h>
@@ skipping 110 matching lines @@
       tabstrip_(NULL),
       active_bookmark_bar_(NULL),
       tab_contents_container_(NULL),
       custom_window_enabled_(false),
       saved_window_placement_(false),
       on_mouse_leave_armed_(false),
       in_drag_session_(false),
       shelf_view_(NULL),
       bookmark_bar_view_(NULL),
       info_bar_view_(NULL),
+      needs_layout_(false),
       is_off_the_record_(false),
       off_the_record_image_(NULL),
       distributor_logo_(NULL),
       ignore_ncactivate_(false),
       should_save_window_placement_(browser->GetType() != BrowserType::BROWSER),
       browser_view_(NULL) {
   InitializeIfNeeded();
 }
 
 void VistaFrame::InitializeIfNeeded() {
@@ skipping 238 matching lines @@
   ResetDWMFrame();
 
   tab_contents_container_->SetBounds(browser_x,
                                      browser_y,
                                      browser_w,
                                      browser_h);
 
   browser_view_->LayoutStatusBubble(browser_y + browser_h);
 
   frame_view_->SchedulePaint();
+  needs_layout_ = false;
 }
 
 ////////////////////////////////////////////////////////////////////////////////
 //
 // BrowserWindow implementation
 //
 ////////////////////////////////////////////////////////////////////////////////
 
 void VistaFrame::Init() {
   FrameUtil::RegisterBrowserWindow(this);
@@ skipping 1201 matching lines @@
     bookmark_bar_view_.reset(NULL);
 
     browser_->tabstrip_model()->RemoveObserver(tabstrip_);
     delete browser_;
     browser_ = NULL;
   }
 }
 
 void VistaFrame::ShelfVisibilityChangedImpl(TabContents* current_tab) {
   // Coalesce layouts.
-  bool changed = false;
-
   ChromeViews::View* new_shelf = NULL;
   if (current_tab && current_tab->IsDownloadShelfVisible())
     new_shelf = current_tab->GetDownloadShelfView();
-  changed |= UpdateChildViewAndLayout(new_shelf, &shelf_view_);
+  needs_layout_ |= UpdateChildViewAndLayout(new_shelf, &shelf_view_);
 
   ChromeViews::View* new_info_bar = NULL;
   WebContents* web_contents = current_tab ? current_tab->AsWebContents() : NULL;
   if (web_contents && web_contents->view()->IsInfoBarVisible())
     new_info_bar = web_contents->view()->GetInfoBarView();
-  changed |= UpdateChildViewAndLayout(new_info_bar, &info_bar_view_);
+  needs_layout_ |= UpdateChildViewAndLayout(new_info_bar, &info_bar_view_);
 
   ChromeViews::View* new_bookmark_bar_view = NULL;
   if (SupportsBookmarkBar())
     new_bookmark_bar_view = GetBookmarkBarView();
-  changed |= UpdateChildViewAndLayout(new_bookmark_bar_view,
-                                      &active_bookmark_bar_);
+  needs_layout_ |= UpdateChildViewAndLayout(new_bookmark_bar_view,
+                                            &active_bookmark_bar_);
 
   // Only do a layout if the current contents is non-null. We assume that if the
   // contents is NULL, we're either being destroyed, or ShowTabContents is going
   // to be invoked with a non-null TabContents again so that there is no need
   // in doing a layout now (and would result in extra work/invalidation on
   // tab switches).
-  if (changed && current_tab)
+  if (needs_layout_ && current_tab)
     Layout();
 }