Revert of [Mac][Material Design] Fix toolbar height on Retina.

chrome/browser/ui/cocoa/location_bar/autocomplete_text_field.mm

 // Copyright (c) 2011 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/ui/cocoa/location_bar/autocomplete_text_field.h"
 
 #include "base/logging.h"
 #import "base/mac/mac_util.h"
 #import "base/mac/sdk_forward_declarations.h"
 #include "chrome/browser/themes/theme_service.h"
 #import "chrome/browser/ui/cocoa/browser_window_controller.h"
 #import "chrome/browser/ui/cocoa/location_bar/autocomplete_text_field_cell.h"
 #import "chrome/browser/ui/cocoa/location_bar/autocomplete_text_field_editor.h"
 #import "chrome/browser/ui/cocoa/location_bar/location_bar_decoration.h"
 #include "chrome/browser/ui/cocoa/omnibox/omnibox_view_mac.h"
 #import "chrome/browser/ui/cocoa/toolbar/toolbar_controller.h"
 #import "chrome/browser/ui/cocoa/url_drop_target.h"
 #import "chrome/browser/ui/cocoa/view_id_util.h"
 #import "ui/base/cocoa/nsview_additions.h"
 #include "ui/base/material_design/material_design_controller.h"
 #include "ui/gfx/scoped_ns_graphics_context_save_gstate_mac.h"
 
 namespace {
 const CGFloat kAnimationDuration = 0.2;
 const CGFloat kShadowInset = 3;
+const CGFloat kShadowColor = 69 / 255.;
 
 }
 
 // A view that draws a 1px shadow line beneath the autocomplete textfield.
 @interface AutocompleteTextFieldShadowView : NSView {
  @private
   AutocompleteTextField* textField_;  // Weak. Owns this.
 }
 // This is the designated initializer for AutocompleteTextFieldShadowView.
 - (instancetype)initWithTextField:(AutocompleteTextField*)aTextField;
@@ skipping 42 matching lines @@
   [self adjustFrame];
 }
 
 - (void)drawRect:(NSRect)rect {
   // Don't draw anything on a Retina display because on Retina there's room
   // for the shadow just beneath the autocomplete textfield path stroke. Why
   // even add this view? If the user drags the Incognito window between Retina
   // and non-Retina screens there would have to be logic to add and remove the
   // view. It's easier just to always add it for Incognito mode and draw
   // nothing into it.
-  if (![[self window] inIncognitoModeWithSystemTheme] ||
-      [self cr_lineWidth] < 1) {
+  if (![[self window] inIncognitoMode] || [self cr_lineWidth] < 1) {
     return;
   }
   [[AutocompleteTextField shadowColor] set];
-  NSRectFillUsingOperation(rect, NSCompositeSourceOver);
+  NSRectFill(rect);
 }
 
 @end
 
 @implementation AutocompleteTextField
 
 @synthesize observer = observer_;
 
 + (Class)cellClass {
   return [AutocompleteTextFieldCell class];
 }
 
 + (NSColor*)shadowColor {
-  return [NSColor colorWithGenericGamma22White:0 alpha:0.14];
+  return [NSColor colorWithGenericGamma22White:kShadowColor alpha:1];
 }
 
 - (void)dealloc {
   [[NSNotificationCenter defaultCenter] removeObserver:self];
   [shadowView_ removeFromSuperview];
   [super dealloc];
 }
 
 - (void)awakeFromNib {
   DCHECK([[self cell] isKindOfClass:[AutocompleteTextFieldCell class]]);
@@ skipping 547 matching lines @@
                                   NSMinY(frame),
                                   suggestWidth,
                                   NSHeight(frame));
 
   gfx::ScopedNSGraphicsContextSaveGState saveGState;
   NSRectClip(suggestRect);
   [cell drawInteriorWithFrame:frame inView:controlView];
 }
 
 }  // namespace autocomplete_text_field