Hide the password bubble when the underlying ManagePasswordsUIController changes its state.

chrome/browser/ui/views/passwords/manage_passwords_icon_view.cc

 // Copyright 2013 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/passwords/manage_passwords_icon_view.h"
 
 #include "chrome/app/chrome_command_ids.h"
 #include "chrome/browser/command_updater.h"
 #include "chrome/browser/ui/passwords/manage_passwords_ui_controller.h"
 #include "chrome/browser/ui/views/passwords/manage_passwords_bubble_view.h"
 #include "components/password_manager/core/common/password_manager_ui.h"
 #include "ui/base/l10n/l10n_util.h"
 #include "ui/base/resource/resource_bundle.h"
 
 ManagePasswordsIconView::ManagePasswordsIconView(CommandUpdater* updater)
     : BubbleIconView(updater, IDC_MANAGE_PASSWORDS_FOR_PAGE) {
   SetFocusable(true);
   UpdateVisibleUI();
 }
 
 ManagePasswordsIconView::~ManagePasswordsIconView() {}
 
 void ManagePasswordsIconView::UpdateVisibleUI() {
   if (state() == password_manager::ui::INACTIVE_STATE) {
     SetVisible(false);
-    if (ManagePasswordsBubbleView::IsShowing())
-      ManagePasswordsBubbleView::CloseBubble();
     return;
   }
 
   SetVisible(true);
   SetImage(ui::ResourceBundle::GetSharedInstance().GetImageSkiaNamed(icon_id_));
   SetTooltipText(l10n_util::GetStringUTF16(tooltip_text_id_));
 
   // We may be about to automatically pop up a ManagePasswordsBubbleView.
   // Force layout of the icon's parent now; the bubble will be incorrectly
   // positioned otherwise, as the icon won't have been drawn into position.
   parent()->Layout();
 }
 
+void ManagePasswordsIconView::OnChangingState() {
+  // If there is an opened bubble for the current icon it should go away.
+  if (active())
+    ManagePasswordsBubbleView::CloseBubble();
+}
+
 bool ManagePasswordsIconView::IsBubbleShowing() const {
   // If the bubble is being destroyed, it's considered showing though it may be
   // already invisible currently.
   return ManagePasswordsBubbleView::manage_password_bubble() != NULL;
 }
 
 void ManagePasswordsIconView::OnExecuting(
     BubbleIconView::ExecuteSource source) {
 }
 
@@ skipping 16 matching lines @@
     return true;
   }
   return BubbleIconView::OnKeyPressed(event);
 }
 
 void ManagePasswordsIconView::AboutToRequestFocusFromTabTraversal(
     bool reverse) {
   if (active())
     ManagePasswordsBubbleView::ActivateBubble();
 }