Add signal strength indicator icon to WebBluetooth chooser on non-Mac desktops

chrome/browser/ui/views/chooser_content_view.cc

Index: chrome/browser/ui/views/chooser_content_view.cc
diff --git a/chrome/browser/ui/views/chooser_content_view.cc b/chrome/browser/ui/views/chooser_content_view.cc
index 6ae3d32f4a50e61d2ff570234140d02958829013..3a128430abd721a8a5fdc6b97e90e05c6d900cfe 100644
--- a/chrome/browser/ui/views/chooser_content_view.cc
+++ b/chrome/browser/ui/views/chooser_content_view.cc
@@ -5,7 +5,11 @@
 #include "chrome/browser/ui/views/chooser_content_view.h"
 
 #include "chrome/grit/generated_resources.h"
+#include "grit/ui_resources.h"
 #include "ui/base/l10n/l10n_util.h"
+#include "ui/base/resource/resource_bundle.h"
+#include "ui/gfx/image/image_skia.h"
+#include "ui/gfx/image/image_skia_operations.h"
 #include "ui/views/controls/link.h"
 #include "ui/views/controls/styled_label.h"
 #include "ui/views/controls/table/table_view.h"
@@ -20,6 +24,9 @@ const int kChooserHeight = 220;
 
 const int kThrobberDiameter = 24;
 
+// Images for strength bars.
+const int kNumStrengthBarImages = 5;
+
 }  // namespace
 
 ChooserContentView::ChooserContentView(
@@ -29,8 +36,11 @@ ChooserContentView::ChooserContentView(
   chooser_controller_->set_view(this);
   std::vector<ui::TableColumn> table_columns;
   table_columns.push_back(ui::TableColumn());
-  table_view_ =
-      new views::TableView(this, table_columns, views::TEXT_ONLY, true);
+  table_view_ = new views::TableView(this, table_columns,
+                                     chooser_controller_->HasIconBeforeText()
+                                         ? views::ICON_AND_TEXT
+                                         : views::TEXT_ONLY,
+                                     true /* single_selection */);
   table_view_->set_select_on_remove(false);
   table_view_->SetObserver(table_view_observer);
   table_view_->SetEnabled(chooser_controller_->NumOptions() > 0);
@@ -80,6 +90,34 @@ base::string16 ChooserContentView::GetText(int row, int column_id) {
 
 void ChooserContentView::SetObserver(ui::TableModelObserver* observer) {}
 
+gfx::ImageSkia ChooserContentView::GetIcon(int row) {
+  if (!chooser_controller_->HasIconBeforeText())

[msw, 2016/08/12 23:08:49]

nit: can we DCHECK this instead? TableView probably shouldn't ask.

[juncai, 2016/08/15 21:53:19]

Done.

+    return gfx::ImageSkia();
+
+  int num_options = static_cast<int>(chooser_controller_->NumOptions());

[msw, 2016/08/12 23:08:49]

nit: avoid this static cast.

[juncai, 2016/08/15 21:53:19]

Use base::checked_cast instead of static_cast.

Done.

+  if (num_options == 0) {
+    DCHECK_EQ(0, row);
+    return gfx::ImageSkia();
+  }
+
+  DCHECK_GE(row, 0);
+  DCHECK_LT(row, num_options);
+
+  int level =
+      chooser_controller_->GetSignalStrengthLevel(static_cast<size_t>(row));
+
+  if (level == -1)
+    return gfx::ImageSkia();
+
+  gfx::ImageSkia* images =
+      ResourceBundle::GetSharedInstance().GetImageSkiaNamed(
+          IDR_NETWORK_BARS_DARK);
+  int width = images->width();
+  int height = images->height() / kNumStrengthBarImages;
+  return gfx::ImageSkiaOperations::ExtractSubset(

[msw, 2016/08/12 23:08:49]

The icons look a bit squished in the screenshot, can you make out the individual
bars locally? Perhaps something is scaling these images incorrectly, or just
making them so small that it looks bad. I see that the icons will be updated
later according the bug, but I wonder if we could get vector icons, use some
other existing iconography for now, or just make sure the images aren't scaled
weird for now.

[juncai, 2016/08/15 21:53:19]

I update and use icons from:
https://icons.googleplex.com/#signal
And I uploaded a screenshot to the issue page.

+      *images, gfx::Rect(0, level * height, width, height));

[msw, 2016/08/12 23:08:49]

interesting! perhaps add a comment?

[juncai, 2016/08/15 21:53:19]

I borrowed the idea from:
https://cs.chromium.org/chromium/src/ui/chromeos/network/network_icon.cc?cl=G...
But now since each strength level has its own icon, this is not used any more.

+}
+
 void ChooserContentView::OnOptionsInitialized() {
   table_view_->OnModelChanged();
   UpdateTableView();