[Mac][Material Design] Update Omnibox dropdown on Mac to MD

chrome/browser/ui/cocoa/location_bar/star_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/star_decoration.h"
 
 #include "chrome/app/chrome_command_ids.h"
 #include "chrome/browser/command_updater.h"
 #import "chrome/browser/ui/cocoa/omnibox/omnibox_view_mac.h"
 #import "chrome/browser/ui/cocoa/themed_window.h"
 #include "chrome/grit/generated_resources.h"
 #include "grit/components_strings.h"
 #include "grit/theme_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"
 
 namespace {
 
 // The info-bubble point should look like it points to the point
 // between the star's lower tips.  The popup should be where the
 // Omnibox popup ends up (2px below field).  Determined via Pixie.app
 // magnification.
 const CGFloat kStarPointYOffset = 2.0;
 
 }  // namespace
 
 StarDecoration::StarDecoration(CommandUpdater* command_updater)
     : command_updater_(command_updater) {
   SetVisible(true);
   SetStarred(false, false);
 }
 
 StarDecoration::~StarDecoration() {
 }
 
-void StarDecoration::SetStarred(bool starred, bool locationBarIsDark) {
+void StarDecoration::SetStarred(bool starred, bool location_bar_is_dark) {
   starred_ = starred;
-  const int image_id = starred ? IDR_STAR_LIT : IDR_STAR;
   const int tip_id = starred ? IDS_TOOLTIP_STARRED : IDS_TOOLTIP_STAR;
-  if (ui::MaterialDesignController::IsModeMaterial()) {
-    NSImage* theImage;
-    gfx::VectorIconId iconId = starred_ ?
-        gfx::VectorIconId::LOCATION_BAR_STAR_ACTIVE :
-        gfx::VectorIconId::LOCATION_BAR_STAR;
-    SkColor starColor = gfx::kPlaceholderColor;
-    if (locationBarIsDark) {
-      starColor = SK_ColorWHITE;
-    } else if (starred_) {
-      starColor = gfx::kGoogleBlue500;
-    } else {
-      starColor = gfx::kChromeIconGrey;
-    }
-    theImage = NSImageFromImageSkia(gfx::CreateVectorIcon(
-        iconId, 16, starColor));
-    SetImage(theImage);
-  } else {
+  if (!ui::MaterialDesignController::IsModeMaterial()) {
+    const int image_id = starred ? IDR_STAR_LIT : IDR_STAR;
     SetImage(OmniboxViewMac::ImageForResource(image_id));
+    tooltip_.reset([l10n_util::GetNSStringWithFixup(tip_id) retain]);
+    return;
   }
+  SetImage(GetMaterialIcon(location_bar_is_dark));
   tooltip_.reset([l10n_util::GetNSStringWithFixup(tip_id) retain]);
 }
 
 NSPoint StarDecoration::GetBubblePointInFrame(NSRect frame) {
   const NSRect draw_frame = GetDrawRectInFrame(frame);
   return NSMakePoint(NSMidX(draw_frame),
                      NSMaxY(draw_frame) - kStarPointYOffset);
 }
 
 bool StarDecoration::AcceptsMousePress() {
   return true;
 }
 
 bool StarDecoration::OnMousePressed(NSRect frame, NSPoint location) {
   command_updater_->ExecuteCommand(IDC_BOOKMARK_PAGE);
   return true;
 }
 
 NSString* StarDecoration::GetToolTip() {
   return tooltip_.get();
 }
+
+SkColor StarDecoration::GetMaterialIconColor(bool location_bar_is_dark) {
+  if (location_bar_is_dark) {
+    return starred_ ? gfx::kGoogleBlue300 : SkColorSetA(SK_ColorWHITE, 0xCC);
+  }
+  return starred_ ? gfx::kGoogleBlue500 : gfx::kChromeIconGrey;
+}
+
+gfx::VectorIconId StarDecoration::GetMaterialVectorIconId() {
+  return starred_ ? gfx::VectorIconId::LOCATION_BAR_STAR_ACTIVE
+                  : gfx::VectorIconId::LOCATION_BAR_STAR;
+}