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

chrome/browser/ui/views/toolbar/toolbar_view.cc

 // Copyright 2013 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/toolbar/toolbar_view.h"
 
 #include <algorithm>
 
 #include "base/command_line.h"
 #include "base/i18n/number_formatting.h"
@@ skipping 753 matching lines @@
         PopupTopSpacing() + (GetWidget()->ShouldWindowContentsBeTransparent() ?
             kPopupBottomSpacingGlass : kPopupBottomSpacingNonGlass));
   }
   return size;
 }
 
 void ToolbarView::LoadImages() {
   ui::ThemeProvider* tp = GetThemeProvider();
 
   if (ui::MaterialDesignController::IsModeMaterial()) {
-    const int kButtonSize = 16;
     const SkColor normal_color =
         tp->GetColor(ThemeProperties::COLOR_TOOLBAR_BUTTON_ICON);
     const SkColor disabled_color =
         tp->GetColor(ThemeProperties::COLOR_TOOLBAR_BUTTON_ICON_INACTIVE);
 
     back_->SetImage(views::Button::STATE_NORMAL,
-                    gfx::CreateVectorIcon(gfx::VectorIconId::NAVIGATE_BACK,
-                                          kButtonSize, normal_color));
+                    gfx::CreatePrimaryVectorIcon(
+                        gfx::VectorIconId::NAVIGATE_BACK, normal_color));
     back_->SetImage(views::Button::STATE_DISABLED,
-                    gfx::CreateVectorIcon(gfx::VectorIconId::NAVIGATE_BACK,
-                                          kButtonSize, disabled_color));
-    forward_->SetImage(
-        views::Button::STATE_NORMAL,
-        gfx::CreateVectorIcon(gfx::VectorIconId::NAVIGATE_FORWARD, kButtonSize,
-                              normal_color));
+                    gfx::CreatePrimaryVectorIcon(
+                        gfx::VectorIconId::NAVIGATE_BACK, disabled_color));
+    forward_->SetImage(views::Button::STATE_NORMAL,
+                       gfx::CreatePrimaryVectorIcon(
+                           gfx::VectorIconId::NAVIGATE_FORWARD, normal_color));
     forward_->SetImage(
         views::Button::STATE_DISABLED,
-        gfx::CreateVectorIcon(gfx::VectorIconId::NAVIGATE_FORWARD, kButtonSize,
-                              disabled_color));
+        gfx::CreatePrimaryVectorIcon(gfx::VectorIconId::NAVIGATE_FORWARD,
+                                     disabled_color));
     home_->SetImage(views::Button::STATE_NORMAL,
-                    gfx::CreateVectorIcon(gfx::VectorIconId::NAVIGATE_HOME,
-                                          kButtonSize, normal_color));
+                    gfx::CreatePrimaryVectorIcon(
+                        gfx::VectorIconId::NAVIGATE_HOME, normal_color));
     app_menu_button_->UpdateIcon();
   } else {
     back_->SetImage(views::Button::STATE_NORMAL,
                     *(tp->GetImageSkiaNamed(IDR_BACK)));
     back_->SetImage(views::Button::STATE_DISABLED,
                     *(tp->GetImageSkiaNamed(IDR_BACK_D)));
     forward_->SetImage(views::Button::STATE_NORMAL,
                        *(tp->GetImageSkiaNamed(IDR_FORWARD)));
     forward_->SetImage(views::Button::STATE_DISABLED,
                        *(tp->GetImageSkiaNamed(IDR_FORWARD_D)));
@@ skipping 22 matching lines @@
 void ToolbarView::OnShowHomeButtonChanged() {
   Layout();
   SchedulePaint();
 }
 
 int ToolbarView::content_shadow_height() const {
   return GetLayoutConstant(
       (browser_->host_desktop_type() == chrome::HOST_DESKTOP_TYPE_ASH) ?
           TOOLBAR_CONTENT_SHADOW_HEIGHT_ASH : TOOLBAR_CONTENT_SHADOW_HEIGHT);
 }