Convert location bar decorations to Material Design (Mac).

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

Index: chrome/browser/ui/cocoa/location_bar/save_credit_card_decoration.mm
diff --git a/chrome/browser/ui/cocoa/location_bar/save_credit_card_decoration.mm b/chrome/browser/ui/cocoa/location_bar/save_credit_card_decoration.mm
index 708ddc6a7dd7e788456c4c1619122168f954e0eb..85d5a0bb7030b1f839e86d91b8e9dfab5612840f 100644
--- a/chrome/browser/ui/cocoa/location_bar/save_credit_card_decoration.mm
+++ b/chrome/browser/ui/cocoa/location_bar/save_credit_card_decoration.mm
@@ -8,19 +8,37 @@
 #include "chrome/browser/command_updater.h"
 #include "chrome/grit/generated_resources.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"
 
 SaveCreditCardDecoration::SaveCreditCardDecoration(
     CommandUpdater* command_updater)
-    : command_updater_(command_updater) {
-  SetImage(NSImageFromImageSkia(gfx::CreateVectorIcon(
-      gfx::VectorIconId::CREDIT_CARD, 16, SkColorSetRGB(0x96, 0x96, 0x96))));
+    : command_updater_(command_updater),
+      icon_initialized_(false) {
 }
 
 SaveCreditCardDecoration::~SaveCreditCardDecoration() {}
 
+void SaveCreditCardDecoration::SetIcon(bool locationBarIsDark) {
+  if (icon_initialized_)

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

What happens if they change themes? This bool locks out any change in decoration
with a difference in the bool parameter.

Now that I realize it, do you test these CL with a theme change to make sure
everything gets redrawn properly?

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

Thank you for catching this.

I have been testing switching themes with my changes. I don't think I tested the
decorations with theme changes because the location bar does not change color to
match the custom theme color (i.e. it will have a white background in a light
theme or a dark theme). So theoretically the decorations only need to be
configured for their initial theme darkness. However your question had led me to
realize that if I set a custom theme, create an Incognito window (the location
bar will be white because it's a custom theme), and then reset to the default
theme, the location bar is still white in the Incognito window. So right now the
location bar has the assumption that it need never change color once initially
configured. I need to fix that bug (in a separate cl) and from there see if the
decorations have problems as well.

[Avi (use Gerrit), 2016/03/15 20:01:33]

Thanks for checking.

+    return;
+
+  SkColor theColor = gfx::kPlaceholderColor;
+  if (ui::MaterialDesignController::IsModeMaterial()) {
+    theColor = locationBarIsDark ? SK_ColorWHITE : gfx::kChromeIconGrey;
+  } else {
+    theColor = SkColorSetRGB(0x96, 0x96, 0x96);
+  }
+
+  SetImage(NSImageFromImageSkia(gfx::CreateVectorIcon(
+        gfx::VectorIconId::CREDIT_CARD, 16, theColor)));
+
+  icon_initialized_ = true;
+}
+
 NSPoint SaveCreditCardDecoration::GetBubblePointInFrame(NSRect frame) {
   const NSRect draw_frame = GetDrawRectInFrame(frame);
   return NSMakePoint(NSMidX(draw_frame), NSMaxY(draw_frame));