Rebase BookmarkBubble on the new views bubble.

views/bubble/bubble_delegate.cc

 // Copyright (c) 2011 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 "views/bubble/bubble_delegate.h"
 
 #include "ui/base/animation/slide_animation.h"
 #include "views/bubble/bubble_frame_view.h"
 #include "views/widget/widget.h"
 
@@ skipping 94 matching lines @@
     border_widget_->Close();
 }
 
 // static
 Widget* BubbleDelegateView::CreateBubble(BubbleDelegateView* bubble_delegate,
                                          Widget* parent_widget) {
   bubble_delegate->Init();
   Widget* bubble_widget = CreateBubbleWidget(bubble_delegate, parent_widget);
 
 #if defined(OS_WIN) && !defined(USE_AURA)
+  // First set the contents view to initialize view bounds for widget sizing.
+  bubble_widget->SetContentsView(bubble_delegate->GetContentsView());
   bubble_delegate->InitializeBorderWidget(parent_widget);
-  bubble_widget->SetContentsView(bubble_delegate->GetContentsView());
   bubble_widget->SetBounds(bubble_delegate->GetBubbleClientBounds());
 #else
   bubble_widget->SetBounds(bubble_delegate->GetBubbleBounds());
 #endif
 
   bubble_widget->AddObserver(bubble_delegate);
   if (parent_widget && parent_widget->GetTopLevelWidget())
     parent_widget->GetTopLevelWidget()->DisableInactiveRendering();
   return bubble_widget;
 }
@@ skipping 124 matching lines @@
 }
 
 gfx::Rect BubbleDelegateView::GetBubbleClientBounds() const {
   gfx::Rect client_bounds(GetBubbleFrameView()->GetBoundsForClientView());
   client_bounds.Offset(border_widget_->GetWindowScreenBounds().origin());
   return client_bounds;
 }
 #endif
 
 }  // namespace views