For some vector icons, get the size from the vector definition.

chrome/browser/ui/views/tabs/tab.cc

 // Copyright (c) 2012 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/tabs/tab.h"
 
 #include <limits>
 
 #include "base/command_line.h"
 #include "base/debug/alias.h"
@@ skipping 114 matching lines @@
 const SkColor kImmersiveInactiveTabColor = SkColorSetRGB(190, 190, 190);
 
 // The minimum opacity (out of 1) when a tab (either active or inactive) is
 // throbbing in the immersive mode light strip.
 const double kImmersiveTabMinThrobOpacity = 0.66;
 
 // Number of steps in the immersive mode loading animation.
 const int kImmersiveLoadingStepCount = 32;
 
 const char kTabCloseButtonName[] = "TabCloseButton";
-const int kTabCloseButtonSize = 16;
 
 chrome::HostDesktopType GetHostDesktopType(views::View* view) {
   // Widget is NULL when tabs are detached.
   views::Widget* widget = view->GetWidget();
   return chrome::GetHostDesktopTypeForNativeView(
       widget ? widget->GetNativeView() : NULL);
 }
 
 // Stop()s |animation| and then deletes it. We do this rather than just deleting
 // so that the delegate is notified before the destruction.
@@ skipping 256 matching lines @@
 
   media_indicator_button_ = new MediaIndicatorButton(this);
   AddChildView(media_indicator_button_);
 
   close_button_ = new TabCloseButton(this);
   close_button_->SetAccessibleName(
       l10n_util::GetStringUTF16(IDS_ACCNAME_CLOSE));
   // The normal image is set by OnButtonColorMaybeChanged() because it depends
   // on the current theme and active state.  The hovered and pressed images
   // don't depend on the these, so we can set them here.
-  const gfx::ImageSkia& hovered = gfx::CreateVectorIcon(
-      gfx::VectorIconId::TAB_CLOSE_HOVERED_PRESSED, kTabCloseButtonSize,
-      SkColorSetARGB(0xFF, 0xDB, 0x44, 0x37));
-  const gfx::ImageSkia& pressed = gfx::CreateVectorIcon(
-      gfx::VectorIconId::TAB_CLOSE_HOVERED_PRESSED, kTabCloseButtonSize,
-      SkColorSetARGB(0xFF, 0xA8, 0x35, 0x2A));
+  const gfx::ImageSkia& hovered =
+      gfx::CreatePrimaryVectorIcon(gfx::VectorIconId::TAB_CLOSE_HOVERED_PRESSED,
+                                   SkColorSetARGB(0xFF, 0xDB, 0x44, 0x37));
+  const gfx::ImageSkia& pressed =
+      gfx::CreatePrimaryVectorIcon(gfx::VectorIconId::TAB_CLOSE_HOVERED_PRESSED,
+                                   SkColorSetARGB(0xFF, 0xA8, 0x35, 0x2A));
   close_button_->SetImage(views::CustomButton::STATE_HOVERED, &hovered);
   close_button_->SetImage(views::CustomButton::STATE_PRESSED, &pressed);
 
   // Disable animation so that the red danger sign shows up immediately
   // to help avoid mis-clicks.
   close_button_->SetAnimationDuration(0);
   AddChildView(close_button_);
 
   set_context_menu_controller(this);
 }
@@ skipping 1066 matching lines @@
     return;
 
   const SkColor title_color = theme_provider->GetColor(IsActive() ?
       ThemeProperties::COLOR_TAB_TEXT :
       ThemeProperties::COLOR_BACKGROUND_TAB_TEXT);
   const SkColor new_button_color = SkColorSetA(title_color, 0xA0);
   if (button_color_ != new_button_color) {
     button_color_ = new_button_color;
     title_->SetEnabledColor(title_color);
     media_indicator_button_->OnParentTabButtonColorChanged();
-    const gfx::ImageSkia& close_button_normal_image = gfx::CreateVectorIcon(
-        gfx::VectorIconId::TAB_CLOSE_NORMAL, kTabCloseButtonSize,
-        button_color_);
+    const gfx::ImageSkia& close_button_normal_image =
+        gfx::CreatePrimaryVectorIcon(gfx::VectorIconId::TAB_CLOSE_NORMAL,
+                                     button_color_);
     close_button_->SetImage(views::CustomButton::STATE_NORMAL,
                             &close_button_normal_image);
   }
 }
 
 void Tab::ScheduleIconPaint() {
   gfx::Rect bounds = favicon_bounds_;
   if (bounds.IsEmpty())
     return;
 
@@ skipping 94 matching lines @@
                          const gfx::ImageSkia& image) {
   DCHECK_NE(scale_factor, ui::SCALE_FACTOR_NONE);
   ImageCacheEntry entry;
   entry.resource_id = resource_id;
   entry.scale_factor = scale_factor;
   entry.image = image;
   image_cache_->push_front(entry);
   if (image_cache_->size() > kMaxImageCacheSize)
     image_cache_->pop_back();
 }