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

ui/views/bubble/bubble_delegate.cc

 // Copyright (c) 2012 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 "ui/views/bubble/bubble_delegate.h"
 
 #include "ui/base/animation/slide_animation.h"
 #include "ui/gfx/color_utils.h"
 #include "ui/gfx/rect.h"
 #include "ui/native_theme/native_theme.h"
@@ skipping 102 matching lines @@
 BubbleDelegateView::BubbleDelegateView()
     : close_on_esc_(true),
       close_on_deactivate_(true),
       anchor_view_(NULL),
       anchor_widget_(NULL),
       move_with_anchor_(false),
       arrow_(BubbleBorder::TOP_LEFT),
       shadow_(BubbleBorder::SMALL_SHADOW),
       color_explicitly_set_(false),
       margins_(kDefaultMargin, kDefaultMargin, kDefaultMargin, kDefaultMargin),
+      match_title_margins_(false),
       original_opacity_(255),
       border_widget_(NULL),
       use_focusless_(false),
       accept_events_(true),
       border_accepts_events_(true),
       adjust_if_offscreen_(true),
       parent_window_(NULL) {
   AddAccelerator(ui::Accelerator(ui::VKEY_ESCAPE, ui::EF_NONE));
   UpdateColorsFromTheme(GetNativeTheme());
 }
 
 BubbleDelegateView::BubbleDelegateView(
     View* anchor_view,
     BubbleBorder::Arrow arrow)
     : close_on_esc_(true),
       close_on_deactivate_(true),
       anchor_view_(anchor_view),
       anchor_widget_(NULL),
       move_with_anchor_(false),
       arrow_(arrow),
       shadow_(BubbleBorder::SMALL_SHADOW),
       color_explicitly_set_(false),
       margins_(kDefaultMargin, kDefaultMargin, kDefaultMargin, kDefaultMargin),
+      match_title_margins_(false),
       original_opacity_(255),
       border_widget_(NULL),
       use_focusless_(false),
       accept_events_(true),
       border_accepts_events_(true),
       adjust_if_offscreen_(true),
       parent_window_(NULL) {
   AddAccelerator(ui::Accelerator(ui::VKEY_ESCAPE, ui::EF_NONE));
   UpdateColorsFromTheme(GetNativeTheme());
 }
@@ skipping 45 matching lines @@
 bool BubbleDelegateView::ShouldShowCloseButton() const {
   return false;
 }
 
 View* BubbleDelegateView::GetContentsView() {
   return this;
 }
 
 NonClientFrameView* BubbleDelegateView::CreateNonClientFrameView(
     Widget* widget) {
-  BubbleFrameView* frame = new BubbleFrameView(margins());
+  BubbleFrameView* frame = new BubbleFrameView(match_title_margins_ ?

[msw, 2013/08/08 18:34:26]

Could individual bubbles instead call BubbleDelegateView::set_margins with
values obtained from a static BubbleFrameView::GetTitleInsets similar to the
function you've already added there? I don't like the flag clobbering the
|margins()| value and manipulating the preferred size internally.

[Dan Beam, 2013/08/08 21:15:59]

Done.

+      views::BubbleFrameView::ContentsInsetsToMatchTitle() : margins());
   const BubbleBorder::Arrow adjusted_arrow = base::i18n::IsRTL() ?
       BubbleBorder::horizontal_mirror(arrow()) : arrow();
   frame->SetBubbleBorder(new BubbleBorder(adjusted_arrow, shadow(), color()));
   return frame;
 }
 
+gfx::Size BubbleDelegateView::GetPreferredSize() {
+  if (!match_title_margins_)
+    return WidgetDelegateView::GetPreferredSize();
+
+  NonClientFrameView* fv = GetWidget()->non_client_view()->frame_view();
+  int width = fv->GetBoundsForClientView().width() + GetInsets().width();
+  return gfx::Size(width, GetHeightForWidth(width));
+}
+
 void BubbleDelegateView::OnWidgetDestroying(Widget* widget) {
   if (anchor_widget() == widget) {
     anchor_widget_->RemoveObserver(this);
     anchor_view_ = NULL;
     anchor_widget_ = NULL;
   }
 }
 
 void BubbleDelegateView::OnWidgetVisibilityChanged(Widget* widget,
                                                    bool visible) {
@@ skipping 171 matching lines @@
 #if defined(OS_WIN) && !defined(USE_AURA)
 gfx::Rect BubbleDelegateView::GetBubbleClientBounds() const {
   gfx::Rect client_bounds(GetBubbleFrameView()->GetBoundsForClientView());
   client_bounds.Offset(
       border_widget_->GetWindowBoundsInScreen().OffsetFromOrigin());
   return client_bounds;
 }
 #endif
 
 }  // namespace views