Move around more vector icons.

chrome/browser/ui/views/device_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/device_chooser_content_view.h"
 
 #include "base/memory/ptr_util.h"
 #include "base/numerics/safe_conversions.h"
+#include "chrome/app/vector_icons/vector_icons.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/geometry/point.h"
 #include "ui/gfx/geometry/rect.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/styled_label.h"
 #include "ui/views/controls/table/table_view.h"
 #include "ui/views/controls/throbber.h"
 #include "ui/views/widget/widget.h"
 
 namespace {
 
 const int kChooserWidth = 370;
 
@@ skipping 121 matching lines @@
 
   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);
-  }
+  if (chooser_controller_->IsConnected(row))
+    return gfx::CreateVectorIcon(kBluetoothConnectedIcon, 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(
@@ skipping 151 matching lines @@
 }
 
 void DeviceChooserContentView::SetGetHelpAndReScanLink() {
   DCHECK(footnote_link_);
   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());
 }