Fix a CHECK failure in AutocompletePopupModel::InfoForCurrentSelection().

chrome/browser/autocomplete/autocomplete_popup_model.cc

 // Copyright (c) 2011 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/autocomplete/autocomplete_popup_model.h"
 
 #include <algorithm>
 
 #include "unicode/ubidi.h"
 
@@ skipping 299 matching lines @@
   selected_line_ = result->default_match() == result->end() ?
       kNoMatch : static_cast<size_t>(result->default_match() - result->begin());
   // There had better not be a nonempty result set with no default match.
   CHECK((selected_line_ != kNoMatch) || result->empty());
   // If we're going to trim the window size to no longer include the hovered
   // line, turn hover off.  Practically, this shouldn't happen, but it
   // doesn't hurt to be defensive.
   if ((hovered_line_ != kNoMatch) && (result->size() <= hovered_line_))
     SetHoveredLine(kNoMatch);
 
+  const bool was_open = view_->IsOpen();
   view_->UpdatePopupAppearance();
-  edit_model_->PopupBoundsChangedTo(view_->GetTargetBounds());
+

[Peter Kasting, 2011/01/24 22:10:19]

Nit: Unnecessary blank line

+  if (view_->IsOpen()) {
+    edit_model_->PopupBoundsChangedTo(view_->GetTargetBounds());
+  } else if (was_open) {
+    edit_model_->PopupBoundsChangedTo(gfx::Rect());

[Peter Kasting, 2011/01/24 22:10:19]

Nit: Let's roll this call into the body of OnPopupClosed().  That will make the
API a little simpler to use and let us get rid of the braces here too.

+    edit_model_->OnPopupClosed();
+  }
 }
 
 const SkBitmap* AutocompletePopupModel::GetSpecialIconForMatch(
     const AutocompleteMatch& match) const {
   if (!match.template_url || !match.template_url->IsExtensionKeyword())
     return NULL;
 
   return &profile_->GetExtensionService()->GetOmniboxPopupIcon(
       match.template_url->GetExtensionId());
 }