Update location bar bubble/icon behavior.

chrome/browser/ui/autofill/save_card_bubble_controller_impl.cc

Index: chrome/browser/ui/autofill/save_card_bubble_controller_impl.cc
diff --git a/chrome/browser/ui/autofill/save_card_bubble_controller_impl.cc b/chrome/browser/ui/autofill/save_card_bubble_controller_impl.cc
index 2e43699e3f435ffe870588f220a00da460322e94..b7a804291f2e168d9d1ba09d550fc31ac3c5865d 100644
--- a/chrome/browser/ui/autofill/save_card_bubble_controller_impl.cc
+++ b/chrome/browser/ui/autofill/save_card_bubble_controller_impl.cc
@@ -34,7 +34,7 @@ SaveCardBubbleControllerImpl::SaveCardBubbleControllerImpl(
 
 SaveCardBubbleControllerImpl::~SaveCardBubbleControllerImpl() {
   if (save_card_bubble_view_)
-    save_card_bubble_view_->ControllerGone();
+    save_card_bubble_view_->Hide();
 }
 
 void SaveCardBubbleControllerImpl::SetCallback(
@@ -42,7 +42,7 @@ void SaveCardBubbleControllerImpl::SetCallback(
   save_card_callback_ = save_card_callback;
 }
 
-void SaveCardBubbleControllerImpl::ShowBubble() {
+void SaveCardBubbleControllerImpl::ShowBubble(bool user_action) {
   DCHECK(!save_card_callback_.is_null());
 
   // Need to create location bar icon before bubble, otherwise bubble will be
@@ -50,8 +50,8 @@ void SaveCardBubbleControllerImpl::ShowBubble() {
   UpdateIcon();
 
   Browser* browser = chrome::FindBrowserWithWebContents(web_contents());
-  save_card_bubble_view_ =
-      browser->window()->ShowSaveCreditCardBubble(web_contents(), this);
+  save_card_bubble_view_ = browser->window()->ShowSaveCreditCardBubble(
+      web_contents(), this, user_action);
   DCHECK(save_card_bubble_view_);
 
   // Update icon after creating |save_card_bubble_view_| so that icon will show
@@ -65,10 +65,6 @@ bool SaveCardBubbleControllerImpl::IsIconVisible() const {
   return !save_card_callback_.is_null();
 }
 
-bool SaveCardBubbleControllerImpl::IsIconToggled() const {
-  return !!save_card_bubble_view_;
-}
-
 SaveCardBubbleView* SaveCardBubbleControllerImpl::save_card_bubble_view()
     const {
   return save_card_bubble_view_;
@@ -119,10 +115,12 @@ void SaveCardBubbleControllerImpl::DidNavigateMainFrame(
 
   // Otherwise, get rid of the bubble and icon.
   save_card_callback_.Reset();
-  if (save_card_bubble_view_)
-    save_card_bubble_view_->Close();
-  else
+  if (save_card_bubble_view_) {
+    save_card_bubble_view_->Hide();
+    OnBubbleClosed();
+  } else {
     UpdateIcon();
+  }
 }
 
 }  // namespace autofill