[Mac] Fix Omnibox keyword-search color.

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"
 
 #import "base/logging.h"
 #import "third_party/GTM/AppKit/GTMTheme.h"
 
 namespace {
@@ skipping 227 matching lines @@
 - (void)drawKeywordWithFrame:(NSRect)cellFrame inView:(NSView*)controlView {
   DCHECK(keywordString_);
 
   NSRect textFrame = [self textFrameForFrame:cellFrame];
   const CGFloat x = NSMinX(cellFrame) + kKeywordXOffset;
   NSRect infoFrame(NSMakeRect(x,
                               cellFrame.origin.y + kKeywordYInset,
                               NSMinX(textFrame) - x,
                               cellFrame.size.height - 2 * kKeywordYInset));
 
-  // Draw a token rectangle with rounded corners.
+  // Draw the token rectangle with rounded corners.
   NSRect frame(NSInsetRect(infoFrame, 0.5, 0.5));
   NSBezierPath* path =
       [NSBezierPath bezierPathWithRoundedRect:frame xRadius:4.0 yRadius:4.0];
 
-  [[NSColor controlColor] set];
+  // Matches the color of the highlighted line in the popup.
+  [[NSColor selectedControlColor] set];
   [path fill];
 
-  GTMTheme *theme = [controlView gtm_theme];
-  NSColor* stroke = [theme strokeColorForStyle:GTMThemeStyleToolBarButton
-                                         state:YES];
-  [stroke setStroke];
+  // Border around token rectangle, match focus ring's inner color.
+  [[[NSColor keyboardFocusIndicatorColor] colorWithAlphaComponent:0.5] set];
   [path setLineWidth:1.0];
   [path stroke];
 
   // Draw text w/in the rectangle.
   infoFrame.origin.x += 4.0;
   infoFrame.origin.y += 1.0;
   [keywordString_.get() drawInRect:infoFrame];
 }
 
 - (void)drawInteriorWithFrame:(NSRect)cellFrame inView:(NSView*)controlView {
@@ skipping 33 matching lines @@
                    start:selStart
                   length:selLength];
 }
 
 - (void)resetCursorRect:(NSRect)cellFrame inView:(NSView *)controlView {
   [super resetCursorRect:[self textCursorFrameForFrame:cellFrame]
                   inView:controlView];
 }
 
 @end