[Mac] Rearrange SSL status icon/label in omnibox.

chrome/browser/cocoa/location_bar_view_mac.mm

 // Copyright (c) 2010 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_mac.h"
 #include "app/resource_bundle.h"
 #include "base/i18n/rtl.h"
 #include "base/nsimage_cache_mac.h"
@@ skipping 86 matching lines @@
     CommandUpdater* command_updater,
     ToolbarModel* toolbar_model,
     Profile* profile,
     Browser* browser)
     : edit_view_(new AutocompleteEditViewMac(this, bubble_positioner,
           toolbar_model, profile, command_updater, field)),
       command_updater_(command_updater),
       field_(field),
       disposition_(CURRENT_TAB),
       location_icon_view_(this),
+      security_label_view_(),
       page_action_views_(this, profile, toolbar_model),
       profile_(profile),
       browser_(browser),
       toolbar_model_(toolbar_model),
       transition_(PageTransition::TYPED) {
   for (int i = 0; i < CONTENT_SETTINGS_NUM_TYPES; ++i) {
     ContentSettingImageView* content_setting_view =
         new ContentSettingImageView(static_cast<ContentSettingsType>(i), this,
                                     profile_);
     content_setting_views_.push_back(content_setting_view);
     content_setting_view->SetVisible(false);
   }
 
   AutocompleteTextFieldCell* cell = [field_ autocompleteTextFieldCell];
   [cell setLocationIconView:&location_icon_view_];
+  [cell setSecurityLabelView:&security_label_view_];
   [cell setPageActionViewList:&page_action_views_];
   [cell setContentSettingViewsList:&content_setting_views_];
 
   registrar_.Add(this,
       NotificationType::EXTENSION_PAGE_ACTION_VISIBILITY_CHANGED,
       NotificationService::AllSources());
 }
 
 LocationBarViewMac::~LocationBarViewMac() {
   // Disconnect from cell in case it outlives us.
   AutocompleteTextFieldCell* cell = [field_ autocompleteTextFieldCell];
   [cell setPageActionViewList:NULL];
   [cell setLocationIconView:NULL];
+  [cell setSecurityLabelView:NULL];
 }
 
 std::wstring LocationBarViewMac::GetInputString() const {
   return location_input_;
 }
 
 WindowOpenDisposition LocationBarViewMac::GetWindowOpenDisposition() const {
   return disposition_;
 }
 
@@ skipping 322 matching lines @@
   } else {
     location_icon_view_.SetImage(
         ResourceBundle::GetSharedInstance().GetNSImageNamed(resource_id));
     location_icon_view_.SetVisible(true);
     SetSecurityLabel();
   }
   [field_ resetFieldEditorFrameIfNeeded];
 }
 
 void LocationBarViewMac::SetSecurityLabel() {
-  // TODO(shess): Separate from location icon and move icon to left of address.
   std::wstring security_info_text(toolbar_model_->GetSecurityInfoText());
   if (security_info_text.empty()) {
-    location_icon_view_.SetLabel(nil, nil, nil);
+    security_label_view_.SetLabel(nil, nil, nil);
+    security_label_view_.SetVisible(false);
   } else {
     NSString* icon_label = base::SysWideToNSString(security_info_text);
     NSColor* color;
     if (toolbar_model_->GetSecurityLevel() == ToolbarModel::EV_SECURE) {
       color = [NSColor colorWithCalibratedRed:kEVSecureTextColorRedComponent
                                         green:kEVSecureTextColorGreenComponent
                                          blue:kEVSecureTextColorBlueComponent
                                         alpha:1.0];
     } else {
       color =
           [NSColor colorWithCalibratedRed:kSecurityErrorTextColorRedComponent
                                     green:kSecurityErrorTextColorGreenComponent
                                      blue:kSecurityErrorTextColorBlueComponent
                                     alpha:1.0];
     }
-    location_icon_view_.SetLabel(icon_label, [field_ font], color);
+    security_label_view_.SetLabel(icon_label, [field_ font], color);
+    security_label_view_.SetVisible(true);
   }
 }
 
 void LocationBarViewMac::Observe(NotificationType type,
                                  const NotificationSource& source,
                                  const NotificationDetails& details) {
   switch (type.value) {
     case NotificationType::EXTENSION_PAGE_ACTION_VISIBILITY_CHANGED: {
       TabContents* contents = GetTabContents();
       if (Details<TabContents>(contents) != details)
@@ skipping 52 matching lines @@
     NSAttributedString* attrStr =
         [[NSAttributedString alloc] initWithString:text attributes:attributes];
     label_.reset(attrStr);
   }
 }
 
 void LocationBarViewMac::LocationBarImageView::SetVisible(bool visible) {
   visible_ = visible;
 }
 
+NSSize LocationBarViewMac::LocationBarImageView::GetDefaultImageSize() const {
+  return NSZeroSize;
+}
+
+NSSize LocationBarViewMac::LocationBarImageView::GetImageSize() const {
+  NSImage* image = GetImage();
+  if (image)
+    return [image size];
+  return GetDefaultImageSize();
+}
+
 // LocationIconView ------------------------------------------------------------
 
 LocationBarViewMac::LocationIconView::LocationIconView(
     LocationBarViewMac* owner)
     : owner_(owner) {
 }
 
 LocationBarViewMac::LocationIconView::~LocationIconView() {}
 
 void LocationBarViewMac::LocationIconView::OnMousePressed(NSRect bounds) {
@@ skipping 36 matching lines @@
                        ImageLoadingTracker::DONT_CACHE);
   }
 
   registrar_.Add(this, NotificationType::EXTENSION_HOST_VIEW_SHOULD_CLOSE,
       Source<Profile>(profile_));
 }
 
 LocationBarViewMac::PageActionImageView::~PageActionImageView() {
 }
 
-NSSize LocationBarViewMac::PageActionImageView::GetPreferredImageSize() {
-  NSImage* image = GetImage();
-  if (image) {
-    return [image size];
-  } else {
-    return NSMakeSize(Extension::kPageActionIconMaxSize,
-                      Extension::kPageActionIconMaxSize);
-  }
+NSSize LocationBarViewMac::PageActionImageView::GetDefaultImageSize() const {
+  return NSMakeSize(Extension::kPageActionIconMaxSize,
+                    Extension::kPageActionIconMaxSize);
 }
 
 // Overridden from LocationBarImageView. Either notify listeners or show a
 // popup depending on the Page Action.
 void LocationBarViewMac::PageActionImageView::OnMousePressed(NSRect bounds) {
   if (current_tab_id_ < 0) {
     NOTREACHED() << "No current tab.";
     // We don't want other code to try and handle this click.  Returning true
     // prevents this by indicating that we handled it.
     return;
@@ skipping 276 matching lines @@
       ++result;
   }
   return result;
 }
 
 void LocationBarViewMac::PageActionViewList::OnMousePressed(NSRect iconFrame,
                                                             size_t index) {
   ViewAt(index)->OnMousePressed(iconFrame);
 }