Autofill: Replace "save credit card" infobar with a bubble (Views only).

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
new file mode 100644
index 0000000000000000000000000000000000000000..424777962395cde62b40060c68d5336d6044de1f
--- /dev/null
+++ b/chrome/browser/ui/autofill/save_card_bubble_controller_impl.cc
@@ -0,0 +1,122 @@
+// 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"
+#include "chrome/browser/ui/location_bar/location_bar.h"
+#include "content/public/browser/navigation_details.h"
+
+DEFINE_WEB_CONTENTS_USER_DATA_KEY(autofill::SaveCardBubbleControllerImpl);
+
+namespace {
+
+// Number of seconds the bubble and icon will survive navigations, starting
+// from when the bubble is shown.
+// TODO(bondd): Share with ManagePasswordsUIController.
+const int kSurviveNavigationSeconds = 5;
+
+}  // namespace
+
+namespace autofill {
+
+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();
+}
+
+void SaveCardBubbleControllerImpl::SetCallback(
+    const base::Closure& save_card_callback) {
+  save_card_callback_ = save_card_callback;
+}
+
+void SaveCardBubbleControllerImpl::ShowBubble() {
+  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);
+  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();
+}
+
+void SaveCardBubbleControllerImpl::OnCancelButton() {
+  save_card_callback_.Reset();
+}
+
+void SaveCardBubbleControllerImpl::OnBubbleClosed() {
+  save_card_bubble_view_ = nullptr;

[Evan Stade, 2015/10/23 21:56:30]

reset the callback here instead of above in save and cancel?

(also then you don't need OnCancelButton)

[bondd, 2015/10/23 22:58:28]

Pressing the cancel button causes different behavior than if the dialog closes
for a different reason (e.g. the user clicking outside of the bubble, or the
Chrome window losing focus). When the cancel button is pressed the bubble and
icon go away and don't come back (unless user submits another credit card
number). In the other OnBubbleClosed() cases the bubble has gone away, but can
be brought back by clicking the icon (which is still visible).

save_card_callback_.is_null() indicates whether the bubble and icon are
available (see save_card_callback_ comment in header file), so it can't be reset
in OnBubbleClosed().

+  UpdateIcon();
+}
+
+void SaveCardBubbleControllerImpl::UpdateIcon() {
+  Browser* browser = chrome::FindBrowserWithWebContents(web_contents());
+  LocationBar* location_bar = browser->window()->GetLocationBar();
+  location_bar->UpdateSaveCreditCardIcon();
+}
+
+void SaveCardBubbleControllerImpl::DidNavigateMainFrame(
+    const content::LoadCommittedDetails& details,
+    const content::FrameNavigateParams& params) {
+  // Nothing to do if there's no bubble available.
+  if (save_card_callback_.is_null())
+    return;
+
+  // Don't react to in-page (fragment) navigations.
+  if (details.is_in_page)
+    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.
+  if (save_card_bubble_view_) {
+    save_card_bubble_view_->Close();
+    save_card_bubble_view_ = nullptr;

[Evan Stade, 2015/10/23 21:56:30]

won't the above Close() call already null this out and update the icon. I'd make
this something like

if (save_card_bubble_view_)
  save_card_bubble_view_->Close();
else
  OnBubbleClosed();

[bondd, 2015/10/23 22:58:28]

You are correct about "save_card_bubble_view_ = nullptr" being unnecessary. I
removed it. Shuffled the other stuff around a bit so that UpdateIcon() isn't
called twice when save_card_bubble_view_ != nullptr. In both cases
save_card_callback_.Reset() needs to be called before UpdateIcon() so I moved it
to the top.

Tested both cases and they still work properly.

+  }
+  save_card_callback_.Reset();
+  UpdateIcon();
+}
+
+}  // namespace autofill