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

chrome/browser/views/old_frames/xp_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/xp_frame.h"
 
 #include <windows.h>
 
 #include "base/command_line.h"
 #include "base/gfx/native_theme.h"
@@ skipping 322 matching lines @@
       current_action_(FA_NONE),
       on_mouse_leave_armed_(false),
       previous_cursor_(NULL),
       minimum_size_(100, 100),
       shelf_view_(NULL),
       bookmark_bar_view_(NULL),
       info_bar_view_(NULL),
       is_active_(false),
       is_off_the_record_(false),
       title_bar_height_(0),
+      needs_layout_(false),
       off_the_record_image_(NULL),
       distributor_logo_(NULL),
       ignore_ncactivate_(false),
 #ifdef CHROME_PERSONALIZATION
       personalization_enabled_(false),
       personalization_(NULL),
 #endif
       paint_as_active_(false),
       browser_view_(NULL) {
   InitializeIfNeeded();
@@ skipping 476 matching lines @@
 #ifdef CHROME_PERSONALIZATION
   if (PersonalizationEnabled()) {
     Personalization::ConfigureFramePersonalization(personalization_,
                                                    browser_view_, top_margin);
   }
 #endif
 
   browser_view_->LayoutStatusBubble(last_y + browser_h);
 
   frame_view_->SchedulePaint();
+  needs_layout_ = false;
 }
 
 // This is called when we receive WM_ENDSESSION. We have 5 seconds to quit
 // the application or we are going to be flagged as flaky.
 void XPFrame::OnEndSession(BOOL ending, UINT logoff) {
   tabstrip_->AbortActiveDragSession();
   FrameUtil::EndSession();
 }
 
 // Note: called directly by the handler macros to handle WM_CLOSE messages.
@@ skipping 1628 matching lines @@
     bookmark_bar_view_.reset(NULL);
 
     browser_->tabstrip_model()->RemoveObserver(tabstrip_);
     delete browser_;
     browser_ = NULL;
   }
 }
 
 void XPFrame::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();
-}
-
+}