views impl: hide top infobar arrow when omnibox popup shows

chrome/browser/ui/views/frame/browser_view.cc

 // Copyright 2012 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/ui/views/frame/browser_view.h"
 
 #include <algorithm>
 
 #include "base/auto_reset.h"
 #include "base/command_line.h"
@@ skipping 1075 matching lines @@
       forwards ?
           views::FocusManager::kForward : views::FocusManager::kBackward,
       views::FocusManager::kWrap);
 }
 
 void BrowserView::DestroyBrowser() {
   // After this returns other parts of Chrome are going to be shutdown. Close
   // the window now so that we are deleted immediately and aren't left holding
   // references to deleted objects.
   GetWidget()->RemoveObserver(this);
+  GetLocationBar()->GetLocationEntry()->model()->popup_model()->RemoveObserver(
+      this);
   frame_->CloseNow();
 }
 
 bool BrowserView::IsBookmarkBarVisible() const {
   if (!browser_->SupportsWindowFeature(Browser::FEATURE_BOOKMARKBAR))
     return false;
   if (!bookmark_bar_view_.get())
     return false;
   if (bookmark_bar_view_->GetPreferredSize().height() == 0)
     return false;
@@ skipping 803 matching lines @@
   DCHECK(iter != accelerator_table_.end());
   int command_id = iter->second;
 
   chrome::BrowserCommandController* controller = browser_->command_controller();
   if (!controller->block_command_execution())
     UpdateAcceleratorMetrics(accelerator, command_id);
   return chrome::ExecuteCommand(browser_.get(), command_id);
 }
 
 ///////////////////////////////////////////////////////////////////////////////
+// BrowserView, OmniboxPopupModelObserver overrides:
+void BrowserView::OnOmniboxPopupShownOrHidden() {
+  infobar_container_->SetMaxTopArrowHeight(GetMaxTopInfoBarArrowHeight());
+}
+
+///////////////////////////////////////////////////////////////////////////////
 // BrowserView, ImmersiveModeController::Delegate overrides:
 
 BookmarkBarView* BrowserView::GetBookmarkBar() {
   return bookmark_bar_view_.get();
 }
 
 FullscreenController* BrowserView::GetFullscreenController() {
   // Cannot be injected into ImmersiveModeController because it is constructed
   // after BrowserView.
   return browser()->fullscreen_controller();
@@ skipping 155 matching lines @@
   SetLayoutManager(browser_view_layout);
 
 #if defined(OS_WIN) && !defined(USE_AURA)
   // Create a custom JumpList and add it to an observer of TabRestoreService
   // so we can update the custom JumpList when a tab is added or removed.
   if (JumpList::Enabled()) {
     load_complete_listener_.reset(new LoadCompleteListener(this));
   }
 #endif
 
+  GetLocationBar()->GetLocationEntry()->model()->popup_model()->AddObserver(
+      this);
+
   // We're now initialized and ready to process Layout requests.
   ignore_layout_ = false;
 }
 
 void BrowserView::LoadingAnimationCallback() {
   base::TimeTicks now = base::TimeTicks::Now();
   if (!last_animation_time_.is_null()) {
     UMA_HISTOGRAM_TIMES(
         "Tabs.LoadingAnimationTime",
         now - last_animation_time_);
@@ skipping 648 matching lines @@
     overlay->SetBoundsRect(contents_web_view_->bounds());
   contents_container_->AddChildView(overlay);
   contents_container_->SetActive(overlay);
 
   // Overlay is gone, force re-layout of |BrowserView| and infobars.
   OnOverlayStateChanged(true);
 }
 
 int BrowserView::GetMaxTopInfoBarArrowHeight() {
   int top_arrow_height = 0;
-  // Only show the arrows when not in fullscreen and when there's no overlay.
-  if (!IsFullscreen() && !overlay_container_->visible()) {
+  // Only show the arrows when not in fullscreen and when there's no overlay
+  // and no omnibox popup.
+  if (!IsFullscreen() && !overlay_container_->visible() &&
+      !GetLocationBar()->GetLocationEntry()->model()->popup_model()->IsOpen()) {
     const LocationIconView* location_icon_view =
         toolbar_->location_bar()->location_icon_view();
     // The +1 in the next line creates a 1-px gap between icon and arrow tip.
     gfx::Point icon_bottom(0, location_icon_view->GetImageBounds().bottom() -
         LocationBarView::kIconInternalPadding + 1);
     ConvertPointToTarget(location_icon_view, this, &icon_bottom);
     gfx::Point infobar_top(0, infobar_container_->GetVerticalOverlap(NULL));
     ConvertPointToTarget(infobar_container_, this, &infobar_top);
     top_arrow_height = infobar_top.y() - icon_bottom.y();
   }
   return top_arrow_height;
 }