Fix BubbleFrameView title and close button patterns.

ui/views/bubble/bubble_frame_view.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_frame_view.h"
 
 #include <algorithm>
 
 #include "grit/ui_resources.h"
 #include "ui/base/hit_test.h"
@@ skipping 111 matching lines @@
   gfx::Insets border_insets = bubble_border_->GetInsets();
   const SkRect rect = { SkIntToScalar(border_insets.left() - kBorderStrokeSize),
                         SkIntToScalar(border_insets.top() - kBorderStrokeSize),
                         SkIntToScalar(size.width() - border_insets.right() +
                                       kBorderStrokeSize),
                         SkIntToScalar(size.height() - border_insets.bottom() +
                                       kBorderStrokeSize) };
   window_mask->addRoundRect(rect, kCornerRadius, kCornerRadius);
 }
 
-void BubbleFrameView::ResetWindowControls() {}
+void BubbleFrameView::ResetWindowControls() {
+  close_->SetVisible(GetWidget()->widget_delegate()->ShouldShowCloseButton());
+}
 
 void BubbleFrameView::UpdateWindowIcon() {}
 
-void BubbleFrameView::UpdateWindowTitle() {}
+void BubbleFrameView::UpdateWindowTitle() {
+  title_->SetText(GetWidget()->widget_delegate()->ShouldShowWindowTitle() ?
+      GetWidget()->widget_delegate()->GetWindowTitle() : string16());
+  // Update the close button visibility too, otherwise it's not intialized.
+  ResetWindowControls();
+}
 
 gfx::Insets BubbleFrameView::GetInsets() const {
   gfx::Insets insets = content_margins_;
   const int title_height = title_->text().empty() ? 0 :
       title_->GetPreferredSize().height() + kTitleTopInset + kTitleBottomInset;
   const int close_height = close_->visible() ? close_->height() : 0;
   insets += gfx::Insets(std::max(title_height, close_height), 0, 0, 0);
   return insets;
 }
 
@@ skipping 56 matching lines @@
 }
 
 void BubbleFrameView::SetBubbleBorder(BubbleBorder* border) {
   bubble_border_ = border;
   set_border(bubble_border_);
 
   // Update the background, which relies on the border.
   set_background(new views::BubbleBackground(border));
 }
 
-void BubbleFrameView::SetTitle(const string16& title) {
-  title_->SetText(title);
-}
-
-void BubbleFrameView::SetShowCloseButton(bool show) {
-  close_->SetVisible(show);
-}
-
 void BubbleFrameView::SetTitlebarExtraView(View* view) {
   DCHECK(view);
   DCHECK(!titlebar_extra_view_);
   AddChildView(view);
   titlebar_extra_view_ = view;
 }
 
 gfx::Rect BubbleFrameView::GetUpdatedWindowBounds(const gfx::Rect& anchor_rect,
                                                   gfx::Size client_size,
                                                   bool adjust_if_offscreen) {
@@ skipping 82 matching lines @@
   // |offscreen_adjust|, e.g. positive |offscreen_adjust| means bubble
   // window needs to be moved to the right and that means we need to move arrow
   // to the left, and that means negative offset.
   bubble_border_->set_arrow_offset(
       bubble_border_->GetArrowOffset(window_bounds.size()) - offscreen_adjust);
   if (offscreen_adjust)
     SchedulePaint();
 }
 
 }  // namespace views