Convert location bar decorations to Material Design (Mac).

chrome/browser/ui/cocoa/omnibox/omnibox_view_mac.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.
 
 #include "chrome/browser/ui/cocoa/omnibox/omnibox_view_mac.h"
 
 #include <Carbon/Carbon.h>  // kVK_Return
 
 #include "base/mac/foundation_util.h"
 #include "base/metrics/histogram.h"
@@ skipping 13 matching lines @@
 #include "chrome/grit/generated_resources.h"
 #include "components/omnibox/browser/autocomplete_input.h"
 #include "components/omnibox/browser/autocomplete_match.h"
 #include "components/omnibox/browser/omnibox_edit_controller.h"
 #include "components/omnibox/browser/omnibox_field_trial.h"
 #include "components/omnibox/browser/omnibox_popup_model.h"
 #include "components/security_state/security_state_model.h"
 #include "components/toolbar/toolbar_model.h"
 #include "content/public/browser/web_contents.h"
 #include "extensions/common/constants.h"
+#import "skia/ext/skia_utils_mac.h"
 #import "third_party/mozilla/NSPasteboard+Utils.h"
 #include "ui/base/clipboard/clipboard.h"
 #import "ui/base/cocoa/cocoa_base_utils.h"
 #include "ui/base/material_design/material_design_controller.h"
 #include "ui/base/resource/resource_bundle.h"
+#include "ui/gfx/color_palette.h"
 #include "ui/gfx/font.h"
 #include "ui/gfx/font_list.h"
 #include "ui/gfx/geometry/rect.h"
 
 using content::WebContents;
 
 // Focus-handling between |field_| and model() is a bit subtle.
 // Other platforms detect change of focus, which is inconvenient
 // without subclassing NSTextField (even with a subclass, the use of a
 // field editor may complicate things).
@@ skipping 32 matching lines @@
                                     blue:static_cast<float>(bb)/255.0
                                    alpha:1.0];
 }
 
 NSColor* HostTextColor(bool inDarkMode) {
   if (!ui::MaterialDesignController::IsModeMaterial()) {
     return [NSColor blackColor];
   }
   return inDarkMode ? [NSColor whiteColor] : [NSColor blackColor];
 }
-NSColor* BaseTextColor(bool inDarkMode) {
-  if (!ui::MaterialDesignController::IsModeMaterial()) {
-    return [NSColor darkGrayColor];
-  }
-  return inDarkMode ? [NSColor colorWithCalibratedWhite:1 alpha:0.5] :
-                      [NSColor colorWithCalibratedWhite:0 alpha:0.5];
-}
 NSColor* SecureSchemeColor(bool inDarkMode) {
   if (!ui::MaterialDesignController::IsModeMaterial()) {
     return ColorWithRGBBytes(0x07, 0x95, 0x00);
   }
   return inDarkMode ? [NSColor colorWithCalibratedWhite:1 alpha:0.5] :
-                      ColorWithRGBBytes(0x0B, 0x80, 0x43);
+                      skia::SkColorToCalibratedNSColor(gfx::kGoogleGreen700);
 }
 NSColor* SecurityWarningSchemeColor(bool inDarkMode) {
   return inDarkMode ? [NSColor colorWithCalibratedWhite:1 alpha:0.5] :
-                      ColorWithRGBBytes(0xF0, 0x93, 0x00);
+                      skia::SkColorToCalibratedNSColor(gfx::kGoogleYellow700);
 }
 NSColor* SecurityErrorSchemeColor(bool inDarkMode) {
   if (!ui::MaterialDesignController::IsModeMaterial()) {
     return ColorWithRGBBytes(0xa2, 0x00, 0x00);
   }
   return inDarkMode ? [NSColor colorWithCalibratedWhite:1 alpha:0.5] :
-                      ColorWithRGBBytes(0xC5, 0x39, 0x29);
+                      skia::SkColorToCalibratedNSColor(gfx::kGoogleRed700);
 }
 
 const char kOmniboxViewMacStateKey[] = "OmniboxViewMacState";
 
 // Store's the model and view state across tab switches.
 struct OmniboxViewMacState : public base::SupportsUserData::Data {
   OmniboxViewMacState(const OmniboxEditModel::State model_state,
                       const bool has_focus,
                       const NSRange& selection)
       : model_state(model_state),
@@ skipping 30 matching lines @@
 NSImage* OmniboxViewMac::ImageForResource(int resource_id) {
   ui::ResourceBundle& rb = ui::ResourceBundle::GetSharedInstance();
   return rb.GetNativeImageNamed(resource_id).ToNSImage();
 }
 
 // static
 NSColor* OmniboxViewMac::SuggestTextColor() {
   return [NSColor colorWithCalibratedWhite:0.0 alpha:0.5];
 }
 
+// static
+NSColor* OmniboxViewMac::BaseTextColor(bool inDarkMode) {
+  if (!ui::MaterialDesignController::IsModeMaterial()) {
+    return [NSColor darkGrayColor];
+  }
+  return inDarkMode ? [NSColor colorWithCalibratedWhite:1 alpha:0.5]
+                    : [NSColor colorWithCalibratedWhite:0 alpha:0.5];
+}
+
 OmniboxViewMac::OmniboxViewMac(OmniboxEditController* controller,
                                Profile* profile,
                                CommandUpdater* command_updater,
                                AutocompleteTextField* field)
     : OmniboxView(
           controller,
           make_scoped_ptr(new ChromeOmniboxClient(controller, profile))),
       profile_(profile),
       popup_view_(new OmniboxPopupViewMac(this, model(), field)),
       field_(field),
@@ skipping 922 matching lines @@
 
 NSUInteger OmniboxViewMac::GetTextLength() const {
   return [field_ currentEditor] ?  [[[field_ currentEditor] string] length] :
                                    [[field_ stringValue] length];
 }
 
 bool OmniboxViewMac::IsCaretAtEnd() const {
   const NSRange selection = GetSelectedRange();
   return NSMaxRange(selection) == GetTextLength();
 }