Fix the Web Bluetooth chooser when it is used on Chrome apps on non-Mac

chrome/browser/ui/views/chooser_content_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/chooser_content_view.h"
 
 #include "base/numerics/safe_conversions.h"
 #include "chrome/grit/generated_resources.h"
 #include "ui/base/l10n/l10n_util.h"
 #include "ui/base/resource/resource_bundle.h"
@@ skipping 68 matching lines @@
       IDS_BLUETOOTH_DEVICE_CHOOSER_TURN_ON_BLUETOOTH_LINK_TEXT);
   size_t offset = 0;
   base::string16 text = l10n_util::GetStringFUTF16(
       IDS_BLUETOOTH_DEVICE_CHOOSER_TURN_ADAPTER_OFF, link_text, &offset);
   turn_adapter_off_help_ = new views::StyledLabel(text, this);
   turn_adapter_off_help_->AddStyleRange(
       gfx::Range(0, link_text.size()),
       views::StyledLabel::RangeStyleInfo::CreateForLink());
   turn_adapter_off_help_->SetVisible(false);
   AddChildView(turn_adapter_off_help_);
+  footnote_link_ptr_.reset(new views::StyledLabel(help_text_, this));
+  footnote_link_ = footnote_link_ptr_.get();
+  footnote_link_->AddStyleRange(
+      help_text_range_, views::StyledLabel::RangeStyleInfo::CreateForLink());
 }
 
 ChooserContentView::~ChooserContentView() {
   chooser_controller_->set_view(nullptr);
   table_view_->SetObserver(nullptr);
   table_view_->SetModel(nullptr);
 }
 
 gfx::Size ChooserContentView::GetPreferredSize() const {
   return gfx::Size(kChooserWidth, kChooserHeight);
@@ skipping 173 matching lines @@
   return button == ui::DIALOG_BUTTON_OK
              ? chooser_controller_->GetOkButtonLabel()
              : l10n_util::GetStringUTF16(IDS_DEVICE_CHOOSER_CANCEL_BUTTON_TEXT);
 }
 
 bool ChooserContentView::IsDialogButtonEnabled(ui::DialogButton button) const {
   return button != ui::DIALOG_BUTTON_OK ||
          !table_view_->selection_model().empty();
 }
 
 views::StyledLabel* ChooserContentView::CreateFootnoteView() {

[sky, 2016/11/08 05:04:19]

I find the usage of footnote_link_ and footnote_link_ptr_ in this class mildly
confusing. I think the confusion is because of the combination scoped_ptr and
raw pointer. I favor making ChooserContentsView *take* footnote_link_ in its
constructor. That way there you get rid of the create and it's clear someone
else owns the footnote. WDYT?

[juncai, 2016/11/08 19:43:26]

That sounds better. I modified the ChooserContentsView constructor to take a
footnote link.

Done.

-  footnote_link_ = new views::StyledLabel(help_text_, this);
-  footnote_link_->AddStyleRange(
-      help_text_range_, views::StyledLabel::RangeStyleInfo::CreateForLink());
-  return footnote_link_;
+  return footnote_link_ptr_.release();
 }
 
 void ChooserContentView::Accept() {
   chooser_controller_->Select(table_view_->selection_model().active());
 }
 
 void ChooserContentView::Cancel() {
   chooser_controller_->Cancel();
 }
 
@@ skipping 10 matching lines @@
   }
 }
 
 void ChooserContentView::SetGetHelpAndReScanLink() {
   footnote_link_->SetText(help_and_re_scan_text_);
   footnote_link_->AddStyleRange(
       help_text_range_, views::StyledLabel::RangeStyleInfo::CreateForLink());
   footnote_link_->AddStyleRange(
       re_scan_text_range_, views::StyledLabel::RangeStyleInfo::CreateForLink());
 }