[rAC, OSX] Fix focus ring drawing.

chrome/browser/ui/cocoa/autofill/down_arrow_popup_menu_cell.mm

 // Copyright (c) 2013 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/autofill/down_arrow_popup_menu_cell.h"
 
 #include <algorithm>
 
 #include "chrome/browser/ui/cocoa/autofill/autofill_dialog_constants.h"
 
+const int kSidePadding = 2.0;
+
 @implementation DownArrowPopupMenuCell
 
 - (NSSize)imageSize {
   image_button_cell::ButtonState state = image_button_cell::kDefaultState;
   NSView* controlView = [self controlView];
   NSImage* image = [self imageForState:state view:controlView];
   return [image size];
 }
 
 - (NSSize)cellSize {
   NSSize imageSize = [self imageSize];
 
   NSAttributedString* title = [self attributedTitle];
   NSSize size = [title size];
   size.height = std::max(size.height, imageSize.height);
-  size.width += autofill::kButtonGap + imageSize.width;
+  size.width += 2 * kSidePadding + autofill::kButtonGap + imageSize.width;
 
   return size;
 }
 
 - (void)drawWithFrame:(NSRect)cellFrame inView:(NSView*)controlView {
   NSRect imageRect, titleRect;
+  NSRect contentRect = NSInsetRect(cellFrame, kSidePadding, 0);
   NSDivideRect(
-      cellFrame, &imageRect, &titleRect, [self imageSize].width, NSMaxXEdge);
-  [super drawWithFrame:imageRect inView:controlView];
+      contentRect, &imageRect, &titleRect, [self imageSize].width, NSMaxXEdge);
+  [super drawImageWithFrame:imageRect inView:controlView];
 
   NSAttributedString* title = [self attributedTitle];
   if ([title length])
     [self drawTitle:title withFrame:titleRect inView:controlView];
+
+  // Only draw custom focus ring if the 10.7 focus ring APIs are not available.
+  // TODO(groby): Remove once we build against the 10.7 SDK.
+  if (![self respondsToSelector:@selector(drawFocusRingMaskWithFrame:inView:)])
+    [super drawFocusRingWithFrame:cellFrame inView:controlView];
 }
 
 @end