Reland crrev.com/8283cad74e0cad4840d1f with fix for static initializers.

chrome/browser/ui/views/toolbar/reload_button.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/reload_button.h"
 
 #include <stddef.h>
 
 #include "base/macros.h"
 #include "base/strings/utf_string_conversions.h"
 #include "chrome/app/chrome_command_ids.h"
+#include "chrome/app/vector_icons/vector_icons.h"
 #include "chrome/browser/command_updater.h"
 #include "chrome/browser/search/search.h"
 #include "chrome/browser/themes/theme_properties.h"
 #include "chrome/browser/ui/search/search_model.h"
 #include "chrome/grit/generated_resources.h"
 #include "chrome/grit/theme_resources.h"
 #include "ui/base/l10n/l10n_util.h"
 #include "ui/base/models/simple_menu_model.h"
 #include "ui/base/theme_provider.h"
 #include "ui/base/window_open_disposition.h"
 #include "ui/gfx/paint_vector_icon.h"
-#include "ui/gfx/vector_icons_public.h"
 #include "ui/views/metrics.h"
 #include "ui/views/widget/widget.h"
 
 
 namespace {
 
 // Contents of the Reload drop-down menu.
 const int kReloadMenuItems[]  = {
   IDS_RELOAD_MENU_NORMAL_RELOAD_ITEM,
   IDS_RELOAD_MENU_HARD_RELOAD_ITEM,
@@ skipping 191 matching lines @@
   if (!command_updater_)
     return;
   command_updater_->ExecuteCommandWithDisposition(
       command, ui::DispositionFromEventFlags(event_flags));
 }
 
 void ReloadButton::ChangeModeInternal(Mode mode) {
   const ui::ThemeProvider* tp = GetThemeProvider();
   // |tp| can be NULL in unit tests.
   if (tp) {
-    const gfx::VectorIconId icon_id = (mode == MODE_RELOAD)
-                                          ? gfx::VectorIconId::NAVIGATE_RELOAD
-                                          : gfx::VectorIconId::NAVIGATE_STOP;
+    const gfx::VectorIcon& icon =
+        (mode == MODE_RELOAD) ? kNavigateReloadIcon : kNavigateStopIcon;
     const SkColor normal_color =
         tp->GetColor(ThemeProperties::COLOR_TOOLBAR_BUTTON_ICON);
     const SkColor disabled_color =
         tp->GetColor(ThemeProperties::COLOR_TOOLBAR_BUTTON_ICON_INACTIVE);
     SetImage(views::Button::STATE_NORMAL,
-             gfx::CreateVectorIcon(icon_id, normal_color));
+             gfx::CreateVectorIcon(icon, normal_color));
     SetImage(views::Button::STATE_DISABLED,
-             gfx::CreateVectorIcon(icon_id, disabled_color));
+             gfx::CreateVectorIcon(icon, disabled_color));
     set_ink_drop_base_color(normal_color);
   }
 
   visible_mode_ = mode;
   SchedulePaint();
 }
 
 void ReloadButton::OnDoubleClickTimer() {
   if (!IsMenuShowing())
     ChangeMode(intended_mode_, false);
 }
 
 void ReloadButton::OnStopToReloadTimer() {
   DCHECK(!IsMenuShowing());
   ChangeMode(intended_mode_, true);
 }