Implement newly saved card bubble for realz and update generated card bubble to

chrome/browser/ui/views/autofill/new_credit_card_bubble_views.cc

Index: chrome/browser/ui/views/autofill/new_credit_card_bubble_views.cc
diff --git a/chrome/browser/ui/views/autofill/new_credit_card_bubble_views.cc b/chrome/browser/ui/views/autofill/new_credit_card_bubble_views.cc
new file mode 100644
index 0000000000000000000000000000000000000000..7ddf5530bce27439c8089f80fb36e54634ebc1ca
--- /dev/null
+++ b/chrome/browser/ui/views/autofill/new_credit_card_bubble_views.cc
@@ -0,0 +1,122 @@
+// 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/autofill/new_credit_card_bubble_views.h"
+
+#include "chrome/browser/ui/autofill/new_credit_card_bubble_controller.h"
+#include "chrome/browser/ui/browser_finder.h"
+#include "chrome/browser/ui/host_desktop.h"
+#include "chrome/browser/ui/views/frame/browser_view.h"
+#include "chrome/browser/ui/views/toolbar_view.h"
+#include "ui/gfx/insets.h"
+#include "ui/gfx/size.h"
+#include "ui/views/bubble/bubble_frame_view.h"
+#include "ui/views/controls/image_view.h"
+#include "ui/views/controls/link.h"
+#include "ui/views/layout/box_layout.h"
+#include "ui/views/layout/layout_constants.h"
+#include "ui/views/view.h"
+#include "ui/views/widget/widget.h"
+
+namespace autofill {
+
+namespace {
+
+views::View* GetAnchor(
+    const base::WeakPtr<NewCreditCardBubbleController>& controller) {
+  Browser* browser = chrome::FindTabbedBrowser(controller->profile(), false,
+                                               chrome::GetActiveDesktop());

[Evan Stade, 2013/08/06 22:06:25]

I feel that |browser| should be sorted out based on the web contents that
initiated the dialog. This seems to leave open the possibility that the wrong
browser window will be used.

[Dan Beam, 2013/08/07 02:30:22]

popups don't have a wrench menu, which is why I used FindTabbedBrowser(). also
this bubble knows little about the web contents that initiated it now that it's
only passed a Profile. 99% of the time, the browser holding the initiating web
contents will be the same as the last activated tabbed browser.

[Evan Stade, 2013/08/07 23:31:21]

that doesn't seem right to me, we should still show the popup somewhere in the
current (popup) browser window because the last active tabbed browser might be
minimized, on another desktop, behind some other window, or otherwise not
noticeable. What happens with web autofill when we want to save a cc in a popup
window?

It also seems crappy that a website could show a popup window, trigger the
dialog, then close the popup window, thereby hiding this bubble before the user
has a chance to see it.

[Dan Beam, 2013/08/08 05:23:48]

asked jstark@ on the bug
^ don't know a good solution here unless we want to get into heuristics (i.e.
the bubble has to show for more than 2s before closing else it latches on to
another window, etc.)

+  BrowserView* browser_view = BrowserView::GetBrowserViewForBrowser(browser);
+  return browser_view->GetToolbarView()->app_menu();
+}
+
+}  // namespace
+
+NewCreditCardBubbleViews::~NewCreditCardBubbleViews() {
+  if (controller_)
+    controller_->OnBubbleDestroyed();
+}
+
+void NewCreditCardBubbleViews::Show() {
+  // TODO(dbeam): investigate why this steals focus from the web contents.
+  views::BubbleDelegateView::CreateBubble(this);
+  GetWidget()->Show();
+  SizeToContents();
+}
+
+void NewCreditCardBubbleViews::Hide() {
+  GetWidget()->Close();
+}
+
+void NewCreditCardBubbleViews::Init() {
+  SetLayoutManager(
+      new views::BoxLayout(views::BoxLayout::kVertical, 0, 0,
+                           views::kUnrelatedControlVerticalSpacing));
+
+  views::Label* contents = new views::Label(controller_->ContentsText());
+  contents->SetHorizontalAlignment(gfx::ALIGN_LEFT);
+  contents->SetMultiLine(true);
+  AddChildView(contents);
+
+  views::View* card_container = new views::View();
+  card_container->SetLayoutManager(
+      new views::BoxLayout(views::BoxLayout::kVertical, 0, 0, 10));
+
+  views::View* card_desc_view = new views::View();
+  card_desc_view->SetLayoutManager(
+      new views::BoxLayout(views::BoxLayout::kHorizontal, 0, 0, 10));
+
+  views::ImageView* card_icon = new views::ImageView();
+  const CreditCardDescription& card_desc = controller_->CardDescription();
+  card_icon->SetImage(card_desc.icon.AsImageSkia());
+  card_desc_view->AddChildView(card_icon);
+
+  views::Label* card_name = new views::Label(card_desc.name);
+  card_name->SetHorizontalAlignment(gfx::ALIGN_LEFT);
+  card_desc_view->AddChildView(card_name);
+  card_container->AddChildView(card_desc_view);
+
+  views::Label* desc = new views::Label(card_desc.description);
+  desc->SetHorizontalAlignment(gfx::ALIGN_LEFT);
+  desc->SetMultiLine(true);
+  card_container->AddChildView(desc);
+
+  AddChildView(card_container);
+
+  views::Link* link = new views::Link(controller_->LinkText());
+  link->SetHorizontalAlignment(gfx::ALIGN_LEFT);
+  link->set_listener(this);
+  AddChildView(link);
+}
+
+gfx::Size NewCreditCardBubbleViews::GetPreferredSize() {
+  return gfx::Size(
+      NewCreditCardBubbleViews::kContentWidth,
+      GetHeightForWidth(NewCreditCardBubble::kContentWidth));
+}
+
+void NewCreditCardBubbleViews::LinkClicked(views::Link* source,
+                                           int event_flags) {
+  if (controller_)
+    controller_->OnLinkClicked();
+}
+
+// static
+base::WeakPtr<NewCreditCardBubble> NewCreditCardBubble::Create(
+    const base::WeakPtr<NewCreditCardBubbleController>& controller) {
+  NewCreditCardBubbleViews* bubble =
+      new NewCreditCardBubbleViews(controller);
+  return bubble->weak_ptr_factory_.GetWeakPtr();
+}
+
+NewCreditCardBubbleViews::NewCreditCardBubbleViews(
+    const base::WeakPtr<NewCreditCardBubbleController>& controller)
+    : BubbleDelegateView(GetAnchor(controller), views::BubbleBorder::TOP_RIGHT),
+      controller_(controller),
+      weak_ptr_factory_(this) {
+  // Match bookmarks bubble view's margins.
+  set_margins(gfx::Insets(18, 19, 18, 18));

[Evan Stade, 2013/08/06 22:06:25]

heinous. Perhaps you can create these insets via an EmptyBorder which is hidden
behind some static function call like CreateBorderForBubble() so you don't have
to repeat the constants over and over.

[Dan Beam, 2013/08/07 02:30:22]

check what I did, see if you like

+}
+
+}  // namespace autofill