Reland: Update image and text color when row is selected in the chooser on 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 10 matching lines @@
 
 namespace {
 
 const int kChooserWidth = 330;
 
 const int kChooserHeight = 220;
 
 const int kThrobberDiameter = 24;
 
 // The lookup table for signal strength level image.
-const int kSignalStrengthLevelImageIds[5] = {IDR_SIGNAL_0_BAR, IDR_SIGNAL_1_BAR,
-                                             IDR_SIGNAL_2_BAR, IDR_SIGNAL_3_BAR,
-                                             IDR_SIGNAL_4_BAR};
+const int kSignalStrengthLevelBlackImageIds[5] = {

[sky, 2016/09/21 17:41:19]

Is there a reason views doesn't change color like mac?

Also, did you consider leaving the ones you named as black as they were before
and instead of white using selected? So, you would have IDR_SIGNAL_0_BAR and
IDR_SIGNAL_0_BAR_SELECTED. It seems clearer that way as the names black and
white don't convey their expected usage.

[juncai, 2016/09/21 19:51:24]

The row in the chooser on Mac is a NSView:
https://cs.chromium.org/chromium/src/chrome/browser/ui/cocoa/website_settings...
And it doesn't automatically change its color when selected.
Done.

+    IDR_SIGNAL_0_BAR_BLACK, IDR_SIGNAL_1_BAR_BLACK, IDR_SIGNAL_2_BAR_BLACK,
+    IDR_SIGNAL_3_BAR_BLACK, IDR_SIGNAL_4_BAR_BLACK};
 
 }  // namespace
 
 ChooserContentView::ChooserContentView(
     views::TableViewObserver* table_view_observer,
     std::unique_ptr<ChooserController> chooser_controller)
     : chooser_controller_(std::move(chooser_controller)) {
   chooser_controller_->set_view(this);
   std::vector<ui::TableColumn> table_columns;
   table_columns.push_back(ui::TableColumn());
@@ skipping 73 matching lines @@
     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)));
+  DCHECK_LT(level,
+            static_cast<int>(arraysize(kSignalStrengthLevelBlackImageIds)));
 
   return *ResourceBundle::GetSharedInstance().GetImageSkiaNamed(
-      kSignalStrengthLevelImageIds[level]);
+      kSignalStrengthLevelBlackImageIds[level]);
 }
 
 void ChooserContentView::OnOptionsInitialized() {
   table_view_->OnModelChanged();
   UpdateTableView();
 }
 
 void ChooserContentView::OnOptionAdded(size_t index) {
   table_view_->OnItemsAdded(base::checked_cast<int>(index), 1);
   UpdateTableView();
@@ skipping 116 matching lines @@
 }
 
 void ChooserContentView::UpdateTableView() {
   if (chooser_controller_->NumOptions() == 0) {
     table_view_->OnModelChanged();
     table_view_->SetEnabled(false);
   } else {
     table_view_->SetEnabled(true);
   }
 }