Show device connection and paired status in chooser 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"
+#include "ui/gfx/color_palette.h"
 #include "ui/gfx/image/image_skia.h"
+#include "ui/gfx/paint_vector_icon.h"
+#include "ui/gfx/vector_icons_public.h"
 #include "ui/resources/grit/ui_resources.h"
 #include "ui/views/controls/link.h"
 #include "ui/views/controls/styled_label.h"
 #include "ui/views/controls/table/table_view.h"
 #include "ui/views/controls/throbber.h"
 #include "ui/views/layout/fill_layout.h"
 
 namespace {
 
 const int kChooserWidth = 330;
@@ skipping 59 matching lines @@
 
 base::string16 ChooserContentView::GetText(int row, int column_id) {
   int num_options = base::checked_cast<int>(chooser_controller_->NumOptions());
   if (num_options == 0) {
     DCHECK_EQ(0, row);
     return chooser_controller_->GetNoOptionsText();
   }
 
   DCHECK_GE(row, 0);
   DCHECK_LT(row, num_options);
-  return chooser_controller_->GetOption(static_cast<size_t>(row));
+  base::string16 text =
+      chooser_controller_->GetOption(static_cast<size_t>(row));
+  return chooser_controller_->IsPaired(row)
+             ? l10n_util::GetStringFUTF16(
+                   IDS_DEVICE_CHOOSER_DEVICE_NAME_AND_PAIRED_STATUS_TEXT, text)
+             : text;
 }
 
 void ChooserContentView::SetObserver(ui::TableModelObserver* observer) {}
 
 gfx::ImageSkia ChooserContentView::GetIcon(int row) {
   DCHECK(chooser_controller_->ShouldShowIconBeforeText());
 
   size_t num_options = chooser_controller_->NumOptions();
   if (num_options == 0) {
     DCHECK_EQ(0, row);
     return gfx::ImageSkia();
   }
 
   DCHECK_GE(row, 0);
   DCHECK_LT(row, base::checked_cast<int>(num_options));
 
+  if (chooser_controller_->IsConnected(row)) {
+    return gfx::CreateVectorIcon(gfx::VectorIconId::BLUETOOTH_CONNECTED,
+                                 gfx::kChromeIconGrey);
+  }
+
   int level = chooser_controller_->GetSignalStrengthLevel(row);
 
   if (level == -1)
     return gfx::ImageSkia();
 
   DCHECK_GE(level, 0);
   DCHECK_LT(level, static_cast<int>(arraysize(kSignalStrengthLevelImageIds)));
 
   return *ResourceBundle::GetSharedInstance().GetImageSkiaNamed(
       kSignalStrengthLevelImageIds[level]);
@@ skipping 126 matching lines @@
 }
 
 void ChooserContentView::UpdateTableView() {
   if (chooser_controller_->NumOptions() == 0) {
     table_view_->OnModelChanged();
     table_view_->SetEnabled(false);
   } else {
     table_view_->SetEnabled(true);
   }
 }