Merge 52385 - [Mac] Bring back the omnibox globe for an encore....

chrome/browser/cocoa/location_bar/location_icon_decoration.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.
 
 #include <cmath>
 
 #import "chrome/browser/cocoa/location_bar/location_icon_decoration.h"
 
 #include "base/sys_string_conversions.h"
 #import "chrome/browser/cocoa/image_utils.h"
@@ skipping 12 matching lines @@
 }
 
 void LocationIconDecoration::SetImage(NSImage* image) {
   image_.reset([image retain]);
 }
 
 CGFloat LocationIconDecoration::GetWidthForSpace(CGFloat width) {
   NSImage* image = GetImage();
   if (image) {
     const CGFloat image_width = [image size].width;
-    if (image_width >= width)
+    if (image_width <= width)
       return image_width;
   }
   return kOmittedWidth;
 }
 
 void LocationIconDecoration::DrawInFrame(NSRect frame, NSView* control_view) {
   NSImage* image = GetImage();
   const CGFloat delta_height = NSHeight(frame) - [image size].height;
   const CGFloat y_inset = std::floor(delta_height / 2.0);
   [image drawInRect:NSInsetRect(frame, 0.0, y_inset)
@@ skipping 39 matching lines @@
 
   TabContents* tab = owner_->GetTabContents();
   NavigationEntry* nav_entry = tab->controller().GetActiveEntry();
   if (!nav_entry) {
     NOTREACHED();
     return true;
   }
   tab->ShowPageInfo(nav_entry->url(), nav_entry->ssl(), true);
   return true;
 }