Convert location bar decorations to Material Design (Mac).

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/strings/string16.h"
 #include "base/strings/string_number_conversions.h"
 #include "chrome/app/chrome_command_ids.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 "components/ui/zoom/zoom_controller.h"
 #include "grit/theme_resources.h"
 #include "ui/base/cocoa/cocoa_base_utils.h"
 #include "ui/base/l10n/l10n_util_mac.h"
+#include "ui/base/material_design/material_design_controller.h"
+#include "ui/gfx/color_palette.h"
+#include "ui/gfx/image/image_skia_util_mac.h"
+#include "ui/gfx/paint_vector_icon.h"
+#include "ui/gfx/vector_icons_public.h"
 
 ZoomDecoration::ZoomDecoration(LocationBarViewMac* owner)
     : owner_(owner),
       bubble_(nil) {
 }
 
 ZoomDecoration::~ZoomDecoration() {
   [bubble_ closeWithoutAnimation];
   bubble_.delegate = nil;
 }
 
 bool ZoomDecoration::UpdateIfNecessary(
-    ui_zoom::ZoomController* zoom_controller, bool default_zoom_changed) {
+    ui_zoom::ZoomController* zoom_controller,
+    bool default_zoom_changed,
+    bool location_bar_is_dark) {
   if (!ShouldShowDecoration()) {
     if (!IsVisible() && !bubble_)
       return false;
 
     HideUI();
     return true;
   }
 
   base::string16 zoom_percent =
       base::IntToString16(zoom_controller->GetZoomPercent());
   NSString* zoom_string =
       l10n_util::GetNSStringFWithFixup(IDS_TOOLTIP_ZOOM, zoom_percent);
 
   if (IsVisible() && [tooltip_ isEqualToString:zoom_string] &&
       !default_zoom_changed) {
     return false;
   }
 
-  ShowAndUpdateUI(zoom_controller, zoom_string);
+  ShowAndUpdateUI(zoom_controller, zoom_string, location_bar_is_dark);
   return true;
 }
 
 void ZoomDecoration::ShowBubble(BOOL auto_close) {
   if (bubble_) {
     bubble_.delegate = nil;
     [[bubble_.window parentWindow] removeChildWindow:bubble_.window];
     [bubble_.window orderOut:nil];
     [bubble_ closeWithoutAnimation];
   }
@@ skipping 20 matching lines @@
 void ZoomDecoration::CloseBubble() {
   [bubble_ close];
 }
 
 void ZoomDecoration::HideUI() {
   [bubble_ close];
   SetVisible(false);
 }
 
 void ZoomDecoration::ShowAndUpdateUI(ui_zoom::ZoomController* zoom_controller,
-                                     NSString* tooltip_string) {
-  int image_id = IDR_ZOOM_NORMAL;
-  ui_zoom::ZoomController::RelativeZoom relative_zoom =
-      zoom_controller->GetZoomRelativeToDefault();
-  if (relative_zoom == ui_zoom::ZoomController::ZOOM_BELOW_DEFAULT_ZOOM)
-    image_id = IDR_ZOOM_MINUS;
-  else if (relative_zoom == ui_zoom::ZoomController::ZOOM_ABOVE_DEFAULT_ZOOM)
-    image_id = IDR_ZOOM_PLUS;
+                                     NSString* tooltip_string,
+                                     bool location_bar_is_dark) {
+  if (ui::MaterialDesignController::IsModeMaterial()) {
+    ui_zoom::ZoomController::RelativeZoom relative_zoom =
+        zoom_controller->GetZoomRelativeToDefault();
+    // There is no ZOOM_NORMAL under Material Design.
+    gfx::VectorIconId iconId =
+        relative_zoom == ui_zoom::ZoomController::ZOOM_BELOW_DEFAULT_ZOOM
+            ? gfx::VectorIconId::ZOOM_MINUS
+            : gfx::VectorIconId::ZOOM_PLUS;
 
-  SetImage(OmniboxViewMac::ImageForResource(image_id));
+    SkColor vectorIconColor = location_bar_is_dark ? SK_ColorWHITE
+                                                   : gfx::kChromeIconGrey;
+    NSImage *theImage =

[Avi (use Gerrit), 2016/03/15 16:03:06]

space after the *

[shrike, 2016/03/15 17:54:56]

Done.

+        NSImageFromImageSkia(gfx::CreateVectorIcon(iconId,
+                                                   16,
+                                                   vectorIconColor));
+    SetImage(theImage);
+  } else {
+    int image_id = IDR_ZOOM_NORMAL;
+    ui_zoom::ZoomController::RelativeZoom relative_zoom =
+        zoom_controller->GetZoomRelativeToDefault();
+    if (relative_zoom == ui_zoom::ZoomController::ZOOM_BELOW_DEFAULT_ZOOM)
+      image_id = IDR_ZOOM_MINUS;
+    else if (relative_zoom == ui_zoom::ZoomController::ZOOM_ABOVE_DEFAULT_ZOOM)
+      image_id = IDR_ZOOM_PLUS;
+
+    SetImage(OmniboxViewMac::ImageForResource(image_id));
+  }
 
   tooltip_.reset([tooltip_string retain]);
 
   SetVisible(true);
   [bubble_ onZoomChanged];
 }
 
 NSPoint ZoomDecoration::GetBubblePointInFrame(NSRect frame) {
   return NSMakePoint(NSMaxX(frame), NSMaxY(frame));
 }
@@ skipping 39 matching lines @@
   bubble_ = nil;
 
   // 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();
   }
 }