Move around more vector icons.

chrome/browser/ui/cocoa/location_bar/zoom_decoration.mm

 // 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.
 
 #import "chrome/browser/ui/cocoa/location_bar/zoom_decoration.h"
 
 #include "base/i18n/number_formatting.h"
 #include "base/strings/string16.h"
 #include "base/strings/string_number_conversions.h"
 #include "chrome/app/chrome_command_ids.h"
+#include "chrome/app/vector_icons/vector_icons.h"
 #import "chrome/browser/ui/cocoa/l10n_util.h"
 #import "chrome/browser/ui/cocoa/location_bar/autocomplete_text_field.h"
 #import "chrome/browser/ui/cocoa/location_bar/autocomplete_text_field_cell.h"
 #import "chrome/browser/ui/cocoa/location_bar/location_bar_view_mac.h"
 #import "chrome/browser/ui/cocoa/omnibox/omnibox_view_mac.h"
 #include "chrome/grit/generated_resources.h"
 #include "chrome/grit/theme_resources.h"
 #include "components/zoom/zoom_controller.h"
 #include "ui/base/cocoa/cocoa_base_utils.h"
 #include "ui/base/l10n/l10n_util_mac.h"
 
 ZoomDecoration::ZoomDecoration(LocationBarViewMac* owner)
-    : owner_(owner),
-      bubble_(nil),
-      vector_icon_id_(gfx::VectorIconId::VECTOR_ICON_NONE) {}
+    : owner_(owner), bubble_(nullptr), vector_icon_(nullptr) {}
 
 ZoomDecoration::~ZoomDecoration() {
   [bubble_ closeWithoutAnimation];
   bubble_.delegate = nil;
 }
 
 bool ZoomDecoration::UpdateIfNecessary(zoom::ZoomController* zoom_controller,
                                        bool default_zoom_changed,
                                        bool location_bar_is_dark) {
   if (!ShouldShowDecoration()) {
@@ skipping 54 matching lines @@
 }
 
 void ZoomDecoration::HideUI() {
   [bubble_ close];
   SetVisible(false);
 }
 
 void ZoomDecoration::UpdateUI(zoom::ZoomController* zoom_controller,
                               NSString* tooltip_string,
                               bool location_bar_is_dark) {
-  vector_icon_id_ = gfx::VectorIconId::VECTOR_ICON_NONE;
+  vector_icon_ = nullptr;
   zoom::ZoomController::RelativeZoom relative_zoom =
       zoom_controller->GetZoomRelativeToDefault();
   // There is no icon at the default zoom factor.
   if (relative_zoom == zoom::ZoomController::ZOOM_BELOW_DEFAULT_ZOOM) {
-    vector_icon_id_ = gfx::VectorIconId::ZOOM_MINUS;
+    vector_icon_ = &kZoomMinusIcon;
   } else if (relative_zoom == zoom::ZoomController::ZOOM_ABOVE_DEFAULT_ZOOM) {
-    vector_icon_id_ = gfx::VectorIconId::ZOOM_PLUS;
+    vector_icon_ = &kZoomPlusIcon;
   }
 
   SetImage(GetMaterialIcon(location_bar_is_dark));
 
   tooltip_.reset([tooltip_string retain]);
 
   [bubble_ onZoomChanged];
 }
 
 NSPoint ZoomDecoration::GetBubblePointInFrame(NSRect frame) {
@@ skipping 45 matching lines @@
 
   // If the page is at default zoom then hiding the zoom decoration
   // was suppressed while the bubble was open. Now that the bubble is
   // closed the decoration can be hidden.
   if (IsAtDefaultZoom() && IsVisible()) {
     SetVisible(false);
     owner_->OnDecorationsChanged();
   }
 }
 
-gfx::VectorIconId ZoomDecoration::GetMaterialVectorIconId() const {
-  return vector_icon_id_;
+const gfx::VectorIcon* ZoomDecoration::GetMaterialVectorIcon() const {
+  return vector_icon_;
 }