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

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"
 #include "base/strings/utf_string_conversions.h"
 #include "base/trace_event/trace_event.h"
 #include "build/build_config.h"
 #include "chrome/app/chrome_command_ids.h"
+#include "chrome/app/vector_icons/vector_icons.h"
 #include "chrome/browser/chrome_notification_types.h"
 #include "chrome/browser/command_updater.h"
 #include "chrome/browser/extensions/extension_util.h"
 #include "chrome/browser/profiles/profile.h"
 #include "chrome/browser/themes/theme_properties.h"
 #include "chrome/browser/ui/bookmarks/bookmark_bubble_sign_in_delegate.h"
 #include "chrome/browser/ui/browser.h"
 #include "chrome/browser/ui/browser_command_controller.h"
 #include "chrome/browser/ui/browser_commands.h"
 #include "chrome/browser/ui/browser_content_setting_bubble_model_delegate.h"
@@ skipping 36 matching lines @@
 #include "content/public/browser/web_contents.h"
 #include "ui/accessibility/ax_node_data.h"
 #include "ui/base/l10n/l10n_util.h"
 #include "ui/base/material_design/material_design_controller.h"
 #include "ui/base/theme_provider.h"
 #include "ui/base/window_open_disposition.h"
 #include "ui/compositor/layer.h"
 #include "ui/gfx/canvas.h"
 #include "ui/gfx/image/canvas_image_source.h"
 #include "ui/gfx/paint_vector_icon.h"
-#include "ui/gfx/vector_icons_public.h"
 #include "ui/keyboard/keyboard_controller.h"
 #include "ui/native_theme/native_theme_aura.h"
 #include "ui/views/focus/view_storage.h"
 #include "ui/views/widget/tooltip_manager.h"
 #include "ui/views/widget/widget.h"
 #include "ui/views/window/non_client_view.h"
 
 #if defined(OS_WIN)
 #include "chrome/browser/recovery/recovery_install_global_error_factory.h"
 #include "chrome/browser/ui/views/conflicting_module_view_win.h"
@@ skipping 659 matching lines @@
 void ToolbarView::LoadImages() {
   const ui::ThemeProvider* tp = GetThemeProvider();
 
   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, normal_color));
+      gfx::CreateVectorIcon(kNavigateBackIcon, normal_color));
   back_->SetImage(
       views::Button::STATE_DISABLED,
-      gfx::CreateVectorIcon(gfx::VectorIconId::NAVIGATE_BACK, disabled_color));

[Evan Stade, 2017/01/11 02:25:42]

oops

+      gfx::CreateVectorIcon(kNavigateBackIcon, normal_color));
   forward_->SetImage(
       views::Button::STATE_NORMAL,
-      gfx::CreateVectorIcon(gfx::VectorIconId::NAVIGATE_FORWARD, normal_color));
-  forward_->SetImage(views::Button::STATE_DISABLED,
-                     gfx::CreateVectorIcon(gfx::VectorIconId::NAVIGATE_FORWARD,
-                                           disabled_color));
-  home_->SetImage(
-      views::Button::STATE_NORMAL,
-      gfx::CreateVectorIcon(gfx::VectorIconId::NAVIGATE_HOME, normal_color));
+      gfx::CreateVectorIcon(kNavigateForwardIcon, normal_color));
+  forward_->SetImage(
+      views::Button::STATE_DISABLED,
+      gfx::CreateVectorIcon(kNavigateForwardIcon, disabled_color));
+  home_->SetImage(views::Button::STATE_NORMAL,
+                  gfx::CreateVectorIcon(kNavigateHomeIcon, normal_color));
   app_menu_button_->UpdateIcon();
 
   back_->set_ink_drop_base_color(normal_color);
   forward_->set_ink_drop_base_color(normal_color);
   home_->set_ink_drop_base_color(normal_color);
   app_menu_button_->set_ink_drop_base_color(normal_color);
 
   reload_->LoadImages();
 }
 
 void ToolbarView::ShowCriticalNotification() {
 #if defined(OS_WIN)
   views::BubbleDialogDelegateView::CreateBubble(
       new CriticalNotificationBubbleView(app_menu_button_))->Show();
 #endif
 }
 
 void ToolbarView::ShowOutdatedInstallNotification(bool auto_update_enabled) {
   if (OutdatedUpgradeBubbleView::IsAvailable()) {
     OutdatedUpgradeBubbleView::ShowBubble(app_menu_button_, browser_,
                                           auto_update_enabled);
   }
 }
 
 void ToolbarView::OnShowHomeButtonChanged() {
   Layout();
   SchedulePaint();
 }