Update permission bubble anchor when omnibar is hidden

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 522 matching lines @@
 BrowserView* BrowserView::GetBrowserViewForBrowser(const Browser* browser) {
   return static_cast<BrowserView*>(browser->window());
 }
 
 void BrowserView::InitStatusBubble() {
   status_bubble_.reset(new StatusBubbleViews(contents_web_view_));
   contents_web_view_->SetStatusBubble(status_bubble_.get());
 }
 
 void BrowserView::InitPermissionBubbleView() {
-  std::string languages =
-      browser_->profile()->GetPrefs()->GetString(prefs::kAcceptLanguages);
   permission_bubble_view_.reset(new PermissionBubbleViewViews(
-      GetLocationBarView()->location_icon_view(), languages));
+      browser_->profile()->GetPrefs()->GetString(prefs::kAcceptLanguages)));
+  UpdatePermissionBubbleView();
+}
+
+void BrowserView::UpdatePermissionBubbleView() {
+  if (browser_->SupportsWindowFeature(Browser::FEATURE_LOCATIONBAR)) {
+    permission_bubble_view_->SetAnchor(
+        GetLocationBarView()->location_icon_view(),
+        views::BubbleBorder::TOP_LEFT);
+  } else {
+    permission_bubble_view_->SetAnchor(
+        top_container_,
+        views::BubbleBorder::NONE);
+  }
 }
 
 gfx::Rect BrowserView::GetToolbarBounds() const {
   gfx::Rect toolbar_bounds(toolbar_->bounds());
   if (toolbar_bounds.IsEmpty())
     return toolbar_bounds;
   // The apparent toolbar edges are outside the "real" toolbar edges.
   toolbar_bounds.Inset(-views::NonClientFrameView::kClientEdgeThickness, 0);
   return toolbar_bounds;
 }
@@ skipping 1727 matching lines @@
   }
 
   // Undo our anti-jankiness hacks and force a re-layout. We also need to
   // recompute the height of the infobar top arrow because toggling in and out
   // of fullscreen changes it. Calling ToolbarSizeChanged() will do both these
   // things since it computes the arrow height directly and forces a layout
   // indirectly via UpdateUIForContents(). Reset |in_process_fullscreen_| in
   // order to let the layout occur.
   in_process_fullscreen_ = false;
   ToolbarSizeChanged(false);
+
+  UpdatePermissionBubbleView();
 }
 
 bool BrowserView::ShouldUseImmersiveFullscreenForUrl(const GURL& url) const {
   // Kiosk mode needs the whole screen, and if we're not in an Ash desktop
   // immersive fullscreen doesn't exist.
   if (base::CommandLine::ForCurrentProcess()->HasSwitch(switches::kKioskMode) ||
       browser()->host_desktop_type() != chrome::HOST_DESKTOP_TYPE_ASH) {
     return false;
   }
 
@@ skipping 257 matching lines @@
       !GetLocationBar()->GetOmniboxView()->model()->popup_model()->IsOpen()) {
     gfx::Point icon_bottom(
         toolbar_->location_bar()->GetLocationBarAnchorPoint());
     ConvertPointToTarget(toolbar_->location_bar(), this, &icon_bottom);
     gfx::Point infobar_top(0, infobar_container_->GetVerticalOverlap(nullptr));
     ConvertPointToTarget(infobar_container_, this, &infobar_top);
     top_arrow_height = infobar_top.y() - icon_bottom.y();
   }
   return top_arrow_height;
 }