Update location bar bubble/icon behavior.

chrome/browser/ui/autofill/save_card_bubble_controller_impl.cc

 // Copyright 2015 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/autofill/save_card_bubble_controller_impl.h"
 
 #include "chrome/browser/ui/autofill/save_card_bubble_view.h"
 #include "chrome/browser/ui/browser.h"
 #include "chrome/browser/ui/browser_finder.h"
 #include "chrome/browser/ui/browser_window.h"
@@ skipping 16 matching lines @@
 
 SaveCardBubbleControllerImpl::SaveCardBubbleControllerImpl(
     content::WebContents* web_contents)
     : content::WebContentsObserver(web_contents),
       save_card_bubble_view_(nullptr) {
   DCHECK(web_contents);
 }
 
 SaveCardBubbleControllerImpl::~SaveCardBubbleControllerImpl() {
   if (save_card_bubble_view_)
-    save_card_bubble_view_->ControllerGone();
+    save_card_bubble_view_->Hide();
 }
 
 void SaveCardBubbleControllerImpl::SetCallback(
     const base::Closure& save_card_callback) {
   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
   // unanchored.
   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
   // its "toggled on" state.
   UpdateIcon();
 
   timer_.reset(new base::ElapsedTimer());
 }
 
 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_;
 }
 
 void SaveCardBubbleControllerImpl::OnSaveButton() {
   save_card_callback_.Run();
   save_card_callback_.Reset();
 }
 
@@ skipping 30 matching lines @@
     return;
 
   // Don't do anything if a navigation occurs before a user could reasonably
   // interact with the bubble.
   if (timer_->Elapsed() <
       base::TimeDelta::FromSeconds(kSurviveNavigationSeconds))
     return;
 
   // 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