Implement Material Design for Mac toolbar.

chrome/browser/ui/cocoa/location_bar/autocomplete_text_field_editor.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_editor.h"
 
 #include "base/strings/string_util.h"
 #include "base/strings/sys_string_conversions.h"
 #include "chrome/app/chrome_command_ids.h"  // IDC_*
+#include "chrome/browser/themes/theme_service.h"
 #include "chrome/browser/ui/browser_list.h"
 #import "chrome/browser/ui/cocoa/browser_window_controller.h"
 #import "chrome/browser/ui/cocoa/location_bar/autocomplete_text_field.h"
 #import "chrome/browser/ui/cocoa/location_bar/autocomplete_text_field_cell.h"
 #import "chrome/browser/ui/cocoa/toolbar/toolbar_controller.h"
 #include "chrome/grit/generated_resources.h"
 #import "ui/base/cocoa/find_pasteboard.h"
 #include "ui/base/l10n/l10n_util_mac.h"
+#include "ui/base/material_design/material_design_controller.h"
 
 namespace {
 
 // When too much data is put into a single-line text field, things get
 // janky due to the cost of computing the blink rect.  Sometimes users
 // accidentally paste large amounts, so place a limit on what will be
 // accepted.
 //
 // 10k characters was arbitrarily chosen by seeing how much a text
 // field could handle in a single line before it started getting too
@@ skipping 32 matching lines @@
     // selectively enable them via context menu, but that submenu is not enabled
     // for the omnibox. The substitutions are unlikely to be useful in any case.
     //
     // Also see http://crbug.com/173405 and http://crbug.com/528014.
     NSTextCheckingTypes checkingTypes = 0;
     [self setEnabledTextCheckingTypes:checkingTypes];
   }
   return self;
 }
 
+- (void)viewDidMoveToWindow {
+  // Only care about landing in a window when in Material Design mode.
+  if (![self window] || !ui::MaterialDesignController::IsModeMaterial()) {
+    return;
+  }
+
+  // Only care about Incognito mode with a non-custom theme.
+  if (![[self window] inIncognitoModeWithSystemTheme]) {
+    return;
+  }
+
+  // Draw a light insertion point for MD Incognito.
+  [self setInsertionPointColor:
+      [NSColor colorWithCalibratedWhite:1 alpha:0.75]];
+  // In MD Incognito the text is light gray against a dark background. When
+  // selected, the light gray text against the selection color is illegible.
+  // Rather than tweak or change the selection color, make the text black when
+  // selected.
+  NSColor* textSelectionColor = [NSColor selectedTextBackgroundColor];
+  [self setSelectedTextAttributes:
+      @{NSForegroundColorAttributeName : [NSColor blackColor],
+        NSBackgroundColorAttributeName : textSelectionColor}];

[Avi (use Gerrit), 2016/03/01 19:59:06]

This isn't quite the container literal style that the style guide prescribes.

https://google.github.io/styleguide/objcguide.xml?showone=Container_Literals#...

No shame; every time I do a container literal I have to look it up too.

[shrike, 2016/03/01 20:30:14]

Acknowledged. Thank you. I think it's correct now, but please double-check.

+}
+
 // If the entire field is selected, drag the same data as would be
 // dragged from the field's location icon.  In some cases the textual
 // contents will not contain relevant data (for instance, "http://" is
 // stripped from URLs).
 - (BOOL)dragSelectionWithEvent:(NSEvent *)event
                         offset:(NSSize)mouseOffset
                      slideBack:(BOOL)slideBack {
   AutocompleteTextFieldObserver* observer = [self observer];
   DCHECK(observer);
   if (observer && observer->CanCopy()) {
@@ skipping 457 matching lines @@
       [[self delegate] suggestText],
       [[self delegate] suggestColor],
       self,
       [self bounds]);
   AutocompleteTextFieldObserver* observer = [self observer];
   if (observer)
     observer->OnDidDrawRect();
 }
 
 @end