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

chrome/browser/ui/views/extensions/chooser_dialog_view.cc

 // Copyright 2016 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/extensions/chooser_dialog_view.h"
 
 #include "base/strings/utf_string_conversions.h"
 #include "chrome/browser/chooser_controller/chooser_controller.h"
 #include "chrome/browser/extensions/chrome_extension_chooser_dialog.h"
 #include "chrome/browser/ui/views/chooser_content_view.h"
 #include "chrome/grit/generated_resources.h"
 #include "components/constrained_window/constrained_window_views.h"
 #include "components/web_modal/web_contents_modal_dialog_manager.h"
 #include "content/public/browser/browser_thread.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/window/dialog_client_view.h"
 
 ChooserDialogView::ChooserDialogView(
     std::unique_ptr<ChooserController> chooser_controller) {
   // ------------------------------------
   // | Chooser dialog title             |
   // | -------------------------------- |
   // | | option 0                     | |
   // | | option 1                     | |
   // | | option 2                     | |
@@ skipping 27 matching lines @@
 
 base::string16 ChooserDialogView::GetDialogButtonLabel(
     ui::DialogButton button) const {
   return chooser_content_view_->GetDialogButtonLabel(button);
 }
 
 bool ChooserDialogView::IsDialogButtonEnabled(ui::DialogButton button) const {
   return chooser_content_view_->IsDialogButtonEnabled(button);
 }
 
+views::View* ChooserDialogView::CreateExtraView() {
+  return chooser_content_view_->CreateExtraView();
+}
+
 views::View* ChooserDialogView::CreateFootnoteView() {
-  return chooser_content_view_->CreateFootnoteView(this);
+  return chooser_content_view_->CreateFootnoteView();
 }
 
 bool ChooserDialogView::Accept() {
   chooser_content_view_->Accept();
   return true;
 }
 
 bool ChooserDialogView::Cancel() {
   chooser_content_view_->Cancel();
   return true;
 }
 
 bool ChooserDialogView::Close() {
   chooser_content_view_->Close();
   return true;
 }
 
 views::View* ChooserDialogView::GetContentsView() {
   return chooser_content_view_;
 }
 
 views::Widget* ChooserDialogView::GetWidget() {
   return chooser_content_view_->GetWidget();
 }
 
 const views::Widget* ChooserDialogView::GetWidget() const {
   return chooser_content_view_->GetWidget();
 }
 
-void ChooserDialogView::StyledLabelLinkClicked(views::StyledLabel* label,
-                                               const gfx::Range& range,
-                                               int event_flags) {
-  chooser_content_view_->StyledLabelLinkClicked();
-}
-
 void ChooserDialogView::OnSelectionChanged() {
   GetDialogClientView()->UpdateDialogButtons();
 }
 
 views::TableView* ChooserDialogView::table_view_for_test() const {
   return chooser_content_view_->table_view_for_test();
 }
 
 void ChromeExtensionChooserDialog::ShowDialogImpl(
     std::unique_ptr<ChooserController> chooser_controller) const {
   DCHECK_CURRENTLY_ON(content::BrowserThread::UI);
   DCHECK(chooser_controller);
 
   web_modal::WebContentsModalDialogManager* manager =
       web_modal::WebContentsModalDialogManager::FromWebContents(web_contents_);
   if (manager) {
     constrained_window::ShowWebModalDialogViews(
         new ChooserDialogView(std::move(chooser_controller)), web_contents_);
   }
 }