Add EV certificate text to the Mac location bar...

chrome/browser/cocoa/location_bar_view_mac.mm

 // Copyright (c) 2009 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/cocoa/location_bar_view_mac.h"
 
 #include "app/l10n_util.h"
 #include "app/resource_bundle.h"
 #include "base/string_util.h"
 #include "base/sys_string_conversions.h"
@@ skipping 25 matching lines @@
 // Make sure the TemplateURL still exists.
 // TODO(sky): Once LocationBarView adds a listener to the TemplateURLModel
 // to track changes to the model, this should become a DCHECK.
   const TemplateURL* template_url =
       profile->GetTemplateURLModel()->GetTemplateURLForKeyword(keyword);
   if (template_url)
     return template_url->AdjustedShortNameForLocaleDirection();
   return std::wstring();
 }
 
+// Values for the green text color displayed for EV certificates, based
+// on the values for kEvTextColor in location_bar_view_gtk.cc.
+static const CGFloat kEvTextColorRedComponent = 0.0;
+static const CGFloat kEvTextColorGreenComponent = 0.59;
+static const CGFloat kEvTextColorBlueComponent = 0.08;
+
 }  // namespace
 
 LocationBarViewMac::LocationBarViewMac(
     AutocompleteTextField* field,
     const BubblePositioner* bubble_positioner,
     CommandUpdater* command_updater,
     ToolbarModel* toolbar_model,
     Profile* profile)
     : edit_view_(new AutocompleteEditViewMac(this, bubble_positioner,
           toolbar_model, profile, command_updater, field)),
@@ skipping 204 matching lines @@
     SkBitmap* skiaBitmap = ResourceBundle::GetSharedInstance().
         GetBitmapNamed(IDR_LOCATION_BAR_KEYWORD_HINT_TAB);
     if (skiaBitmap) {
       tab_button_image_.reset([gfx::SkBitmapToNSImage(*skiaBitmap) retain]);
     }
   }
   return tab_button_image_;
 }
 
 void LocationBarViewMac::SetSecurityIcon(ToolbarModel::Icon security_icon) {
+  std::wstring info_text, info_tooltip;
+  ToolbarModel::InfoTextType info_text_type =
+      toolbar_model_->GetInfoText(&info_text, &info_tooltip);
+  NSColor* color = nil;
+  NSString* icon_label = nil;
+  if (info_text_type == ToolbarModel::INFO_EV_TEXT) {
+    icon_label = base::SysWideToNSString(info_text);
+    color =
+      [NSColor colorWithCalibratedRed:kEvTextColorRedComponent
+                                green:kEvTextColorGreenComponent
+                                 blue:kEvTextColorBlueComponent
+                                alpha:1.0];
+  }
+
   ResourceBundle& rb = ResourceBundle::GetSharedInstance();
   AutocompleteTextFieldCell* cell = [field_ autocompleteTextFieldCell];
   switch (security_icon) {
     case ToolbarModel::LOCK_ICON:
-      [cell setHintIcon:rb.GetNSImageNamed(IDR_LOCK)];
+      [cell setHintIcon:rb.GetNSImageNamed(IDR_LOCK)
+                  label:icon_label
+                  color:color];
       break;
     case ToolbarModel::WARNING_ICON:
-      [cell setHintIcon:rb.GetNSImageNamed(IDR_WARNING)];
+      [cell setHintIcon:rb.GetNSImageNamed(IDR_WARNING)
+                  label:icon_label
+                  color:color];
       break;
     case ToolbarModel::NO_ICON:
-      [cell setHintIcon:nil];
+      [cell setHintIcon:nil label:nil color:nil];
       break;
     default:
       NOTREACHED();
       break;
   }
   [field_ resetFieldEditorFrameIfNeeded];
 }