Remove Close button for chooser bubble and call CloseBubble when Cancel

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

Index: chrome/browser/ui/views/website_settings/chooser_bubble_ui_view.cc
diff --git a/chrome/browser/ui/views/website_settings/chooser_bubble_ui_view.cc b/chrome/browser/ui/views/website_settings/chooser_bubble_ui_view.cc
index 15851bf48633194dcca349dd2d234725cfda7a3b..3330818fdfaaac7fe69c5001d6f82e62ff026135 100644
--- a/chrome/browser/ui/views/website_settings/chooser_bubble_ui_view.cc
+++ b/chrome/browser/ui/views/website_settings/chooser_bubble_ui_view.cc
@@ -74,7 +74,6 @@ class ChooserBubbleUiViewDelegate : public views::BubbleDelegateView,
   void Close();
 
   // BubbleDelegateView:
-  bool ShouldShowCloseButton() const override;
   bool ShouldShowWindowTitle() const override;
   base::string16 GetWindowTitle() const override;
   void OnWidgetDestroying(views::Widget* widget) override;
@@ -288,10 +287,6 @@ void ChooserBubbleUiViewDelegate::Close() {
   GetWidget()->Close();
 }
 
-bool ChooserBubbleUiViewDelegate::ShouldShowCloseButton() const {
-  return true;
-}
-
 bool ChooserBubbleUiViewDelegate::ShouldShowWindowTitle() const {
   return true;
 }
@@ -310,12 +305,17 @@ void ChooserBubbleUiViewDelegate::OnWidgetDestroying(views::Widget* widget) {
 
 void ChooserBubbleUiViewDelegate::ButtonPressed(views::Button* button,
                                                 const ui::Event& event) {
+  button_pressed_ = true;

[felt, 2015/12/17 02:16:59]

why did this line move? was there a bug (some ordering dependency), or are you
just moving it around for aesthetics?

[juncai, 2015/12/17 17:57:20]

Yes, it is a bug since chooser_bubble_delegate_->Select or
chooser_bubble_delegate_->Cancel function will call
ChooserBubbleUiViewDelegate::Close and in that function it checks if the bubble
is closed because "Connect"/"Cancel" button is pressed or because tab switching,
tab closing, etc. If it is caused by tab switching, tab closing, etc., then
chooser_bubble_delegate_->Close() needs to be called. So button_pressed_ needs
to be assigned true value before calling chooser_bubble_delegate_->Select or
chooser_bubble_delegate_->Cancel.

+
   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() {