Add throbber and status text to WebBluetooth chooser UI on non-Mac desktops

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 c6cb2d1cb7f2c5b8efcda99ad1ee0eb37d5e1629..2c8470654f756a8798b213ae129320e7158d39c9 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
@@ -23,7 +23,6 @@
 #include "chrome/browser/ui/website_settings/chooser_bubble_delegate.h"
 #include "components/bubble/bubble_controller.h"
 #include "ui/views/controls/styled_label.h"

[msw, 2016/07/18 23:01:31]

nit: remove

[juncai, 2016/07/19 20:42:46]

If removed,
return chooser_content_view_->CreateFootnoteView();
will have compile error:
cannot initialize return object of type 'views::View *' with an rvalue of type
'views::StyledLabel *'

-#include "ui/views/controls/styled_label_listener.h"
 #include "ui/views/controls/table/table_view_observer.h"
 #include "ui/views/window/dialog_client_view.h"
 
@@ -35,7 +34,6 @@ std::unique_ptr<BubbleUi> ChooserBubbleDelegate::BuildBubbleUi() {
 ///////////////////////////////////////////////////////////////////////////////
 // View implementation for the chooser bubble.
 class ChooserBubbleUiViewDelegate : public views::BubbleDialogDelegateView,
-                                    public views::StyledLabelListener,
                                     public views::TableViewObserver {
  public:
   ChooserBubbleUiViewDelegate(
@@ -50,6 +48,7 @@ class ChooserBubbleUiViewDelegate : public views::BubbleDialogDelegateView,
   // views::DialogDelegate:
   base::string16 GetDialogButtonLabel(ui::DialogButton button) const override;
   bool IsDialogButtonEnabled(ui::DialogButton button) const override;
+  views::View* CreateExtraView() override;
   views::View* CreateFootnoteView() override;
   bool Accept() override;
   bool Cancel() override;
@@ -60,11 +59,6 @@ class ChooserBubbleUiViewDelegate : public views::BubbleDialogDelegateView,
   views::Widget* GetWidget() override;
   const views::Widget* GetWidget() const override;
 
-  // views::StyledLabelListener:
-  void StyledLabelLinkClicked(views::StyledLabel* label,
-                              const gfx::Range& range,
-                              int event_flags) override;
-
   // views::TableViewObserver:
   void OnSelectionChanged() override;
 
@@ -74,7 +68,7 @@ class ChooserBubbleUiViewDelegate : public views::BubbleDialogDelegateView,
                     views::BubbleBorder::Arrow anchor_arrow);
 
   void set_bubble_reference(BubbleReference bubble_reference);
-  void UpdateTableModel() const;
+  void UpdateTableView() const;
 
  private:
   ChooserContentView* chooser_content_view_;
@@ -124,8 +118,12 @@ bool ChooserBubbleUiViewDelegate::IsDialogButtonEnabled(
   return chooser_content_view_->IsDialogButtonEnabled(button);
 }
 
+views::View* ChooserBubbleUiViewDelegate::CreateExtraView() {
+  return chooser_content_view_->CreateExtraView();
+}
+
 views::View* ChooserBubbleUiViewDelegate::CreateFootnoteView() {
-  return chooser_content_view_->CreateFootnoteView(this);
+  return chooser_content_view_->CreateFootnoteView();
 }
 
 bool ChooserBubbleUiViewDelegate::Accept() {
@@ -157,13 +155,6 @@ const views::Widget* ChooserBubbleUiViewDelegate::GetWidget() const {
   return chooser_content_view_->GetWidget();
 }
 
-void ChooserBubbleUiViewDelegate::StyledLabelLinkClicked(
-    views::StyledLabel* label,
-    const gfx::Range& range,
-    int event_flags) {
-  chooser_content_view_->StyledLabelLinkClicked();
-}
-
 void ChooserBubbleUiViewDelegate::OnSelectionChanged() {
   GetDialogClientView()->UpdateDialogButtons();
 }
@@ -186,8 +177,8 @@ void ChooserBubbleUiViewDelegate::set_bubble_reference(
   DCHECK(bubble_reference_);
 }
 
-void ChooserBubbleUiViewDelegate::UpdateTableModel() const {
-  chooser_content_view_->UpdateTableModel();
+void ChooserBubbleUiViewDelegate::UpdateTableView() const {
+  chooser_content_view_->UpdateTableView();
 }
 
 //////////////////////////////////////////////////////////////////////////////
@@ -216,7 +207,7 @@ void ChooserBubbleUiView::Show(BubbleReference bubble_reference) {
       chooser_bubble_ui_view_delegate_)
       ->Show();
 
-  chooser_bubble_ui_view_delegate_->UpdateTableModel();
+  chooser_bubble_ui_view_delegate_->UpdateTableView();
 }
 
 void ChooserBubbleUiView::Close() {}