Make WebBluetooth chooser consistent on Android and desktops (desktop part)

chrome/browser/ui/views/chooser_content_view.h

Index: chrome/browser/ui/views/chooser_content_view.h
diff --git a/chrome/browser/ui/views/chooser_content_view.h b/chrome/browser/ui/views/chooser_content_view.h
index af470bd4f4b2105e327cac70aaf537a9fe0ea9b4..28cee60b7bdf66efeae325ead2377c2c520a1a7f 100644
--- a/chrome/browser/ui/views/chooser_content_view.h
+++ b/chrome/browser/ui/views/chooser_content_view.h
@@ -11,7 +11,7 @@
 #include "base/strings/string16.h"
 #include "chrome/browser/chooser_controller/chooser_controller.h"
 #include "ui/base/models/table_model.h"
-#include "ui/views/controls/link_listener.h"
+#include "ui/gfx/range/range.h"
 #include "ui/views/controls/styled_label_listener.h"
 #include "ui/views/view.h"
 
@@ -31,7 +31,6 @@ class Throbber;
 class ChooserContentView : public views::View,
                            public ui::TableModel,
                            public ChooserController::View,
-                           public views::LinkListener,
                            public views::StyledLabelListener {
  public:
   ChooserContentView(views::TableViewObserver* table_view_observer,
@@ -56,9 +55,6 @@ class ChooserContentView : public views::View,
   void OnAdapterEnabledChanged(bool enabled) override;
   void OnRefreshStateChanged(bool refreshing) override;
 
-  // views::LinkListener:
-  void LinkClicked(views::Link* source, int event_flags) override;
-
   // views::StyledLabelListener:
   void StyledLabelLinkClicked(views::StyledLabel* label,
                               const gfx::Range& range,
@@ -68,19 +64,27 @@ class ChooserContentView : public views::View,
   base::string16 GetDialogButtonLabel(ui::DialogButton button) const;
   bool IsDialogButtonEnabled(ui::DialogButton button) const;
   // Ownership of the view is passed to the caller.
-  views::Link* CreateExtraView();
-  // Ownership of the view is passed to the caller.
   views::StyledLabel* CreateFootnoteView();
   void Accept();
   void Cancel();
   void Close();
   void UpdateTableView();
+  void SetGetHelpAndReScanLink();
 
   views::TableView* table_view_for_test() const { return table_view_; }
   views::Throbber* throbber_for_test() const { return throbber_; }
   views::StyledLabel* turn_adapter_off_help_for_test() const {
     return turn_adapter_off_help_;
   }
+  base::string16 help_text_for_test() const { return help_text_; }

[sky, 2016/11/03 13:24:23]

How about friending the test and removing the for_test functions that clutter
the api?

[juncai, 2016/11/03 20:26:24]

Done.

+  base::string16 help_and_scanning_text_for_test() const {
+    return help_and_scanning_text_;
+  }
+  base::string16 help_and_re_scan_text_for_test() const {
+    return help_and_re_scan_text_;
+  }
+  gfx::Range help_text_range_for_test() const { return help_text_range_; }
+  gfx::Range re_scan_text_range_for_test() const { return re_scan_text_range_; }
 
  private:
   std::unique_ptr<ChooserController> chooser_controller_;
@@ -88,8 +92,12 @@ class ChooserContentView : public views::View,
   views::View* table_parent_ = nullptr;  // Weak.
   views::StyledLabel* turn_adapter_off_help_ = nullptr;  // Weak.
   views::Throbber* throbber_ = nullptr;  // Weak.
-  views::Link* discovery_state_ = nullptr;  // Weak.
-  views::StyledLabel* help_link_ = nullptr;  // Weak.
+  views::StyledLabel* footnote_link_ = nullptr;  // Weak.
+  base::string16 help_text_;
+  base::string16 help_and_scanning_text_;
+  base::string16 help_and_re_scan_text_;
+  gfx::Range help_text_range_;
+  gfx::Range re_scan_text_range_;
 
   DISALLOW_COPY_AND_ASSIGN(ChooserContentView);
 };