Remove Close button for chooser bubble and call CloseBubble when Cancel

chrome/browser/ui/views/website_settings/chooser_bubble_ui_view.cc

 // 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/views/website_settings/chooser_bubble_ui_view.h"
 
 #include <string>
 
 #include "base/prefs/pref_service.h"
 #include "base/strings/string16.h"
@@ skipping 56 matching lines @@
  public:
   ChooserBubbleUiViewDelegate(views::View* anchor_view,
                               views::BubbleBorder::Arrow anchor_arrow,
                               ChooserBubbleUiView* owner,
                               ChooserBubbleDelegate* chooser_bubble_delegate);
   ~ChooserBubbleUiViewDelegate() override;
 
   void Close();
 
   // BubbleDelegateView:
-  bool ShouldShowCloseButton() const override;
   bool ShouldShowWindowTitle() const override;
   base::string16 GetWindowTitle() const override;
   void OnWidgetDestroying(views::Widget* widget) override;
 
   // ButtonListener:
   void ButtonPressed(views::Button* button, const ui::Event& event) override;
 
   // views::TableViewObserver:
   void OnSelectionChanged() override;
 
@@ skipping 181 matching lines @@
       l10n_util::GetStringUTF16(IDS_CHOOSER_BUBBLE_CANCEL_BUTTON_TEXT);
   cancel_button_ = new views::LabelButton(this, cancel_text);
   cancel_button_->SetStyle(views::Button::STYLE_BUTTON);
   button_layout->AddView(cancel_button_);
 
   button_layout->AddPaddingRow(0, kBubbleOuterMargin);
 }
 
 ChooserBubbleUiViewDelegate::~ChooserBubbleUiViewDelegate() {
   RemoveAllChildViews(true);
-  if (owner_)
+  if (owner_) {
     owner_->Close();
+    owner_ = nullptr;

[Ken Rockot(use gerrit already), 2015/12/15 06:24:05]

nit: No need to set this to nullptr

[juncai, 2015/12/15 17:23:39]

Done.

+  }
   chooser_table_model_->SetObserver(nullptr);
 }
 
 void ChooserBubbleUiViewDelegate::Close() {
   if (!button_pressed_)
     chooser_bubble_delegate_->Close();
   owner_ = nullptr;
   GetWidget()->Close();
 }
 
-bool ChooserBubbleUiViewDelegate::ShouldShowCloseButton() const {
-  return true;
-}
-
 bool ChooserBubbleUiViewDelegate::ShouldShowWindowTitle() const {
   return true;
 }
 
 base::string16 ChooserBubbleUiViewDelegate::GetWindowTitle() const {
   return l10n_util::GetStringUTF16(IDS_CHOOSER_BUBBLE_PROMPT);
 }
 
 void ChooserBubbleUiViewDelegate::OnWidgetDestroying(views::Widget* widget) {
   views::BubbleDelegateView::OnWidgetDestroying(widget);
   if (owner_) {
     owner_->Close();
     owner_ = nullptr;
   }
 }
 
 void ChooserBubbleUiViewDelegate::ButtonPressed(views::Button* button,
                                                 const ui::Event& event) {
   if (button == connect_button_)
     chooser_bubble_delegate_->Select(table_view_->selection_model().active());
   else
     chooser_bubble_delegate_->Cancel();
   button_pressed_ = true;
-  owner_->Close();
+  if (owner_) {
+    owner_->Close();
+    owner_ = nullptr;
+  }
 }
 
 void ChooserBubbleUiViewDelegate::OnSelectionChanged() {
   connect_button_->SetEnabled(!table_view_->selection_model().empty());
 }
 
 void ChooserBubbleUiViewDelegate::UpdateAnchor(
     views::View* anchor_view,
     views::BubbleBorder::Arrow anchor_arrow) {
   if (GetAnchorView() == anchor_view && arrow() == anchor_arrow)
@@ skipping 68 matching lines @@
     return browser_view->exclusive_access_bubble()->GetView();
 
   return browser_view->top_container();
 }
 
 views::BubbleBorder::Arrow ChooserBubbleUiView::GetAnchorArrow() {
   if (browser_->SupportsWindowFeature(Browser::FEATURE_LOCATIONBAR))
     return views::BubbleBorder::TOP_LEFT;
   return views::BubbleBorder::NONE;
 }