[Mac][Material Design] Bring Omnibox stroke and MD colors up to spec.

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;
 
 }
 
-// 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;
-@end
-
-@interface AutocompleteTextFieldShadowView(Private)
-// Adjusts the shadow view's position whenever its AutocompleteTextField changes
-// its frame.
-- (void)adjustFrame;
-@end
-
-@implementation AutocompleteTextFieldShadowView
-
-- (instancetype)initWithTextField:(AutocompleteTextField*)aTextField {
-  if ((self = [self initWithFrame:NSZeroRect])) {
-    textField_ = aTextField;
-    [[NSNotificationCenter defaultCenter]
-         addObserver:self
-            selector:@selector(adjustFrame)
-                name:NSViewFrameDidChangeNotification
-              object:textField_];
-  }
-  return self;
-}
-
-- (void)dealloc {
-  [[NSNotificationCenter defaultCenter] removeObserver:self];
-  [super dealloc];
-}
-
-- (void)adjustFrame {
-  if (![self window]) {
-    return;
-  }
-  // Make the shadow view 1pt tall and slightly inset from the edges of the
-  // autocomplete textfield.
-  NSRect frame = [textField_ frame];
-  frame.origin.x += kShadowInset;
-  frame.size.width -= kShadowInset * 2;
-  frame.origin.y -= 1;
-  frame.size.height = 1;
-  [self setFrame:frame];
-}
-
-- (void)viewDidMoveToWindow {
-  [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) {
-    return;
-  }
-  [[AutocompleteTextField shadowColor] set];
-  NSRectFillUsingOperation(rect, NSCompositeSourceOver);
-}
-
-@end
-
 @implementation AutocompleteTextField
 
 @synthesize observer = observer_;
 
 + (Class)cellClass {
   return [AutocompleteTextFieldCell class];
 }
 
-+ (NSColor*)shadowColor {
-  return [NSColor colorWithGenericGamma22White:0 alpha:0.14];
-}
-
 - (void)dealloc {
   [[NSNotificationCenter defaultCenter] removeObserver:self];
-  [shadowView_ removeFromSuperview];
   [super dealloc];
 }
 
 - (void)awakeFromNib {
   DCHECK([[self cell] isKindOfClass:[AutocompleteTextFieldCell class]]);
   [[self cell] setTruncatesLastVisibleLine:YES];
   [[self cell] setLineBreakMode:NSLineBreakByTruncatingTail];
   currentToolTips_.reset([[NSMutableArray alloc] init]);
   resizeAnimation_.reset([[NSViewAnimation alloc] init]);
   [resizeAnimation_ setDuration:kAnimationDuration];
@@ skipping 331 matching lines @@
 }
 
 - (void)updateColorsToMatchTheme {
   if (![[self window] inIncognitoMode]) {
     return;
   }
 
   // Invert the textfield's colors when Material Design and Incognito and not
   // a custom theme.
   bool inDarkMode = [[self window] inIncognitoModeWithSystemTheme];
+  const CGFloat kDarkModeGray = 97 / 255.;
   [self setBackgroundColor:
-      inDarkMode ? [NSColor colorWithGenericGamma22White:115 / 255. alpha:1]
+      inDarkMode ? [NSColor colorWithGenericGamma22White:kDarkModeGray
+                                                   alpha:1]
                  : [NSColor whiteColor]];
   [self setTextColor:OmniboxViewMac::BaseTextColor(inDarkMode)];
 }
 
 - (void)viewDidMoveToWindow {
   if (![self window]) {
-    [shadowView_ removeFromSuperview];
-    shadowView_.reset();
     return;
   }
 
   // Allow the ToolbarController to take action upon the
   // AutocompleteTextField being added to the window.
   if (ui::MaterialDesignController::IsModeMaterial()) {
     BrowserWindowController* browserWindowController =
         [BrowserWindowController browserWindowControllerForView:self];
     [[browserWindowController toolbarController] locationBarWasAddedToWindow];
 
-    // Add a 1px shadow below the autocomplete textfield.
-    shadowView_.reset(
-        [[AutocompleteTextFieldShadowView alloc] initWithTextField:self]);
-    [[self superview] addSubview:shadowView_];
-
     [self updateColorsToMatchTheme];
   }
 
   NSNotificationCenter* nc = [NSNotificationCenter defaultCenter];
   [nc addObserver:self
          selector:@selector(windowDidResignKey:)
              name:NSWindowDidResignKeyNotification
            object:[self window]];
   [nc addObserver:self
          selector:@selector(windowDidResize:)
@@ skipping 166 matching lines @@
                                   NSMinY(frame),
                                   suggestWidth,
                                   NSHeight(frame));
 
   gfx::ScopedNSGraphicsContextSaveGState saveGState;
   NSRectClip(suggestRect);
   [cell drawInteriorWithFrame:frame inView:controlView];
 }
 
 }  // namespace autocomplete_text_field