Mac: correctly fix Omnibox drawing (again), and make the focus ring come back.

chrome/browser/cocoa/autocomplete_text_field_cell.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/autocomplete_text_field_cell.h"
 
 #include "app/gfx/font.h"
 #include "app/resource_bundle.h"
 #include "base/logging.h"
 #import "third_party/GTM/AppKit/GTMTheme.h"
@@ skipping 387 matching lines @@
   NSRect imageRect = NSZeroRect;
   NSImage* image = imageView->GetImage();
   image.size = [image size];
   [image setFlipped:[controlView isFlipped]];
   [image drawInRect:imageFrame
            fromRect:imageRect
           operation:NSCompositeSourceOver
            fraction:1.0];
 }
 
-- (void)drawWithFrame:(NSRect)cellFrame inView:(NSView*)controlView {
-  [NSGraphicsContext saveGraphicsState];
-
-  GTMTheme* theme = [controlView gtm_theme];
-
-  NSRect drawFrame = NSInsetRect(cellFrame, 0.5, 1.5);
-  // TODO(viettrungluu): It's hard to do pixel-perfect drawing in Cocoa 'cause
-  // rounding kills you (obviously, the constants below should be 0.5, but then
-  // it doesn't draw correctly).
-  NSRect innerFrame = NSInsetRect(drawFrame, 0.5001, 0.5001);
-  NSBezierPath* innerPath = [NSBezierPath bezierPathWithRect:drawFrame];
-
-  // Paint button background image if there is one (otherwise the border won't
-  // look right).
-  NSImage* backgroundImage =
-      [theme backgroundImageForStyle:GTMThemeStyleToolBarButton state:YES];
-  if (backgroundImage) {
-    NSColor* patternColor = [NSColor colorWithPatternImage:backgroundImage];
-    [patternColor set];
-    // Set the phase to match window.
-    NSRect trueRect = [controlView convertRectToBase:cellFrame];
-    [[NSGraphicsContext currentContext]
-        setPatternPhase:NSMakePoint(NSMinX(trueRect), NSMaxY(trueRect))];
-    [innerPath fill];
-  }
-
-  // Draw the outer stroke (over the background).
-  [[theme strokeColorForStyle:GTMThemeStyleToolBarButton state:YES] setStroke];
-  [innerPath setLineWidth:1];
-  [innerPath stroke];
-
-  // Fill the inside if we're told to.
-  if ([self drawsBackground]) {
-    [[self backgroundColor] setFill];
-    [NSBezierPath fillRect:innerFrame];
-  }
-
-  [NSGraphicsContext restoreGraphicsState];
-
-  [self drawInteriorWithFrame:cellFrame inView:controlView];
-}
-
 - (void)drawInteriorWithFrame:(NSRect)cellFrame inView:(NSView*)controlView {
   if (hintString_) {
     [self drawHintWithFrame:cellFrame inView:controlView];
   } else if (keywordString_) {
     [self drawKeywordWithFrame:cellFrame inView:controlView];
   } else {
     if (security_image_view_ && security_image_view_->IsVisible()) {
       [self drawImageView:security_image_view_
                   inFrame:[self securityImageFrameForFrame:cellFrame]
                    inView:controlView];
     }
 
     const size_t pageActionCount = [self pageActionCount];
     for (size_t i = 0; i < pageActionCount; ++i) {
       LocationBarViewMac::PageActionImageView* view =
           page_action_views_->ViewAt(i);
       if (view && view->IsVisible()) {
         [self drawImageView:view
                     inFrame:[self pageActionFrameForIndex:i inFrame:cellFrame]
                      inView:controlView];
       }
     }
   }
 
   [super drawInteriorWithFrame:cellFrame inView:controlView];
 }
 
 @end