[Mac][Material Design] Update Omnibox dropdown on Mac to MD

chrome/browser/ui/cocoa/omnibox/omnibox_popup_matrix.mm

 // Copyright 2013 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/omnibox/omnibox_popup_matrix.h"
 
 #include "base/logging.h"
 #include "base/mac/foundation_util.h"
 #import "chrome/browser/ui/cocoa/omnibox/omnibox_popup_cell.h"
 #include "chrome/browser/ui/cocoa/omnibox/omnibox_popup_view_mac.h"
@@ skipping 14 matching lines @@
 - (BOOL)selectCellForEvent:(NSEvent*)theEvent;
 @end
 
 @implementation OmniboxPopupTableController
 
 - (instancetype)initWithMatchResults:(const AutocompleteResult&)result
                            tableView:(OmniboxPopupMatrix*)tableView
                            popupView:(const OmniboxPopupViewMac&)popupView
                          answerImage:(NSImage*)answerImage {
   base::scoped_nsobject<NSMutableArray> array([[NSMutableArray alloc] init]);
+  BOOL isDarkTheme = [tableView hasDarkTheme];
   CGFloat max_match_contents_width = 0.0f;
   CGFloat contentsOffset = -1.0f;
   for (const AutocompleteMatch& match : result) {
     if (match.type == AutocompleteMatchType::SEARCH_SUGGEST_TAIL &&
         contentsOffset < 0.0f)
       contentsOffset = [OmniboxPopupCell computeContentsOffset:match];
     base::scoped_nsobject<OmniboxPopupCellData> cellData(
         [[OmniboxPopupCellData alloc]
              initWithMatch:match
             contentsOffset:contentsOffset
-                     image:popupView.ImageForMatch(match)
-               answerImage:(match.answer ? answerImage : nil)]);
+                     image:popupView.ImageForMatch(match, NO)
+               answerImage:(match.answer ? answerImage : nil)
+              forDarkTheme:isDarkTheme]);
+    if (isDarkTheme) {
+      [cellData setIncognitoImage:popupView.ImageForMatch(match, YES)];
+    }
     [array addObject:cellData];
     if (match.type == AutocompleteMatchType::SEARCH_SUGGEST_TAIL) {
       max_match_contents_width =
           std::max(max_match_contents_width, [cellData getMatchContentsWidth]);
     }
   }
 
   [tableView setMaxMatchContentsWidth:max_match_contents_width];
   return [self initWithArray:array];
 }
@@ skipping 54 matching lines @@
   return height;
 }
 
 @end
 
 @implementation OmniboxPopupMatrix
 
 @synthesize separator = separator_;
 @synthesize maxMatchContentsWidth = maxMatchContentsWidth_;
 @synthesize answerLineHeight = answerLineHeight_;
+@synthesize contentLeftPadding = contentLeftPadding_;
+@synthesize hasDarkTheme = hasDarkTheme_;
 
-- (instancetype)initWithObserver:(OmniboxPopupMatrixObserver*)observer {
+- (instancetype)initWithObserver:(OmniboxPopupMatrixObserver*)observer
+                    forDarkTheme:(BOOL)isDarkTheme {
   if ((self = [super initWithFrame:NSZeroRect])) {
     observer_ = observer;
+    hasDarkTheme_ = isDarkTheme;
 
     base::scoped_nsobject<NSTableColumn> column(
         [[NSTableColumn alloc] initWithIdentifier:@"MainColumn"]);
     [column setDataCell:[[[OmniboxPopupCell alloc] init] autorelease]];
     [self addTableColumn:column];
 
     // Cells pack with no spacing.
     [self setIntercellSpacing:NSMakeSize(0.0, 0.0)];
 
     [self setSelectionHighlightStyle:NSTableViewSelectionHighlightStyleNone];
-    [self setBackgroundColor:[NSColor controlBackgroundColor]];
+    NSColor* backgroundColor =
+        OmniboxPopupViewMac::BackgroundColor(hasDarkTheme_);
+    [self setBackgroundColor:backgroundColor];
     [self setAllowsEmptySelection:YES];
     [self deselectAll:self];
 
     [self resetTrackingArea];
 
     base::scoped_nsobject<NSLayoutManager> layoutManager(
         [[NSLayoutManager alloc] init]);
     answerLineHeight_ =
         [layoutManager defaultLineHeightForFont:OmniboxViewMac::GetLargeFont(
                                                     gfx::Font::NORMAL)];
@@ skipping 142 matching lines @@
   [self selectRowIndex:row];
   if (row != -1) {
     DCHECK(observer_);
     observer_->OnMatrixRowSelected(self, row);
     return YES;
   }
   return NO;
 }
 
 @end