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

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

 // Copyright (c) 2012 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.
 
 #include "chrome/browser/ui/cocoa/omnibox/omnibox_popup_view_mac.h"
 
 #include <cmath>
 
 #include "base/mac/mac_util.h"
 #import "base/mac/sdk_forward_declarations.h"
 #include "base/stl_util.h"
 #include "base/strings/sys_string_conversions.h"
 #include "chrome/browser/search/search.h"
 #include "chrome/browser/ui/cocoa/browser_window_controller.h"
 #import "chrome/browser/ui/cocoa/omnibox/omnibox_popup_cell.h"
 #import "chrome/browser/ui/cocoa/omnibox/omnibox_popup_separator_view.h"
 #include "chrome/browser/ui/cocoa/omnibox/omnibox_view_mac.h"
 #include "components/omnibox/browser/autocomplete_match.h"
 #include "components/omnibox/browser/autocomplete_match_type.h"
 #include "components/omnibox/browser/omnibox_edit_model.h"
 #include "components/omnibox/browser/omnibox_popup_model.h"
 #include "grit/theme_resources.h"
 #include "skia/ext/skia_utils_mac.h"
 #import "third_party/google_toolbox_for_mac/src/AppKit/GTMNSAnimation+Duration.h"
 #import "ui/base/cocoa/cocoa_base_utils.h"
 #import "ui/base/cocoa/flipped_view.h"
 #include "ui/base/cocoa/window_size_constants.h"
+#include "ui/base/material_design/material_design_controller.h"
+#include "ui/gfx/color_palette.h"
 #include "ui/gfx/geometry/rect.h"
+#include "ui/gfx/image/image_skia_util_mac.h"
+#include "ui/gfx/paint_vector_icon.h"
 #include "ui/gfx/scoped_ns_graphics_context_save_gstate_mac.h"
 #include "ui/gfx/text_elider.h"
+#include "ui/gfx/vector_icons_public.h"
 
 namespace {
 
+const int kPopupPaddingVertical = 5;
+const int kMaterialPopupPaddingVertical = 4;
+
 // Padding between matrix and the top and bottom of the popup window.
-const CGFloat kPopupPaddingVertical = 5.0;
+CGFloat PopupPaddingVertical() {
+  if (!ui::MaterialDesignController::IsModeMaterial()) {
+    return kPopupPaddingVertical;
+  }
+  return kMaterialPopupPaddingVertical;
+}
 
 // Animation duration when animating the popup window smaller.
 const NSTimeInterval kShrinkAnimationDuration = 0.1;
 
+}  // namespace
+
 // Background colors for different states of the popup elements.
-NSColor* BackgroundColor() {
-  return [NSColor controlBackgroundColor];
+// Static.

[tapted, 2016/04/28 14:29:44]

// static

(I guess this is one exception to the "use sentence style")

[shrike, 2016/04/28 21:05:35]

Done.

+

[tapted, 2016/04/28 14:29:44]

remove blank line

[shrike, 2016/04/28 21:05:35]

Done.

+NSColor* OmniboxPopupViewMac::BackgroundColor(BOOL is_dark_theme) {
+  const CGFloat kMDDarkControlBackround = 40 / 255.;
+  return is_dark_theme
+      ? [NSColor colorWithGenericGamma22White:kMDDarkControlBackround alpha:1]
+      : [NSColor controlBackgroundColor];
 }
 
-}  // namespace
-
 OmniboxPopupViewMac::OmniboxPopupViewMac(OmniboxView* omnibox_view,
                                          OmniboxEditModel* edit_model,
                                          NSTextField* field)
     : omnibox_view_(omnibox_view),
       model_(new OmniboxPopupModel(this, edit_model)),
       field_(field),
       popup_(nil),
       target_popup_frame_(NSZeroRect) {
   DCHECK(omnibox_view);
   DCHECK(edit_model);
@@ skipping 38 matching lines @@
   NSImage* answerImage = nil;
   if (!model_->answer_bitmap().isNull()) {
     answerImage =
         gfx::Image::CreateFrom1xBitmap(model_->answer_bitmap()).CopyNSImage();
   }
   [matrix_ setController:[[OmniboxPopupTableController alloc]
                              initWithMatchResults:result
                                         tableView:matrix_
                                         popupView:*this
                                       answerImage:answerImage]];
-  [matrix_ setSeparator:[OmniboxPopupCell createSeparatorString]];
+  BOOL is_dark_theme = [matrix_ hasDarkTheme];
+  [matrix_ setSeparator:
+      [OmniboxPopupCell createSeparatorStringForDarkTheme:is_dark_theme]];
 
   // Update the selection before placing (and displaying) the window.
   PaintUpdatesNow();
 
   // Calculate the matrix size manually rather than using -sizeToCells
   // because actually resizing the matrix messed up the popup size
   // animation.
   DCHECK_EQ([matrix_ intercellSpacing].height, 0.0);
   PositionPopup(NSHeight([matrix_ frame]));
 }
@@ skipping 42 matching lines @@
                                         defer:NO]);
     [popup_ setBackgroundColor:[NSColor clearColor]];
     [popup_ setOpaque:NO];
 
     // Use a flipped view to pin the matrix top the top left. This is needed
     // for animated resize.
     base::scoped_nsobject<FlippedView> contentView(
         [[FlippedView alloc] initWithFrame:NSZeroRect]);
     [popup_ setContentView:contentView];
 
+    BOOL is_dark_theme = ui::MaterialDesignController::IsModeMaterial() &&
+        [[field_ window] hasDarkTheme];
+
     // View to draw a background beneath the matrix.
     background_view_.reset([[NSBox alloc] initWithFrame:NSZeroRect]);
     [background_view_ setBoxType:NSBoxCustom];
     [background_view_ setBorderType:NSNoBorder];
-    [background_view_ setFillColor:BackgroundColor()];
+    [background_view_ setFillColor:BackgroundColor(is_dark_theme)];
     [background_view_ setContentViewMargins:NSZeroSize];
     [contentView addSubview:background_view_];
 
-    matrix_.reset([[OmniboxPopupMatrix alloc] initWithObserver:this]);
+    matrix_.reset([[OmniboxPopupMatrix alloc] initWithObserver:this
+                                                  forDarkTheme:is_dark_theme]);
     [background_view_ addSubview:matrix_];
 
     top_separator_view_.reset(
         [[OmniboxPopupTopSeparatorView alloc] initWithFrame:NSZeroRect]);
     [contentView addSubview:top_separator_view_];
 
     bottom_separator_view_.reset(
-        [[OmniboxPopupBottomSeparatorView alloc] initWithFrame:NSZeroRect]);
+        [[OmniboxPopupBottomSeparatorView alloc] initWithFrame:NSZeroRect
+                                                  forDarkTheme:is_dark_theme]);
     [contentView addSubview:bottom_separator_view_];
 
     // TODO(dtseng): Ignore until we provide NSAccessibility support.
     [popup_ accessibilitySetOverrideValue:NSAccessibilityUnknownRole
                              forAttribute:NSAccessibilityRoleAttribute];
   }
 }
 
 void OmniboxPopupViewMac::PositionPopup(const CGFloat matrixHeight) {
   BrowserWindowController* controller =
       [BrowserWindowController browserWindowControllerForView:field_];
   NSRect anchor_rect_base = [controller omniboxPopupAnchorRect];
 
   // Calculate the popup's position on the screen.
   NSRect popup_frame = anchor_rect_base;
   // Size to fit the matrix and shift down by the size.
-  popup_frame.size.height = matrixHeight + kPopupPaddingVertical * 2.0;
+  popup_frame.size.height = matrixHeight + PopupPaddingVertical() * 2.0;
   popup_frame.size.height += [OmniboxPopupTopSeparatorView preferredHeight];
   popup_frame.size.height += [OmniboxPopupBottomSeparatorView preferredHeight];
   popup_frame.origin.y -= NSHeight(popup_frame);
 
   // Shift to screen coordinates.
   if ([controller window]) {
     popup_frame = [[controller window] convertRectToScreen:popup_frame];
   }
 
   // Top separator.
@@ skipping 13 matching lines @@
   [bottom_separator_view_ setFrame:bottom_separator_frame];
 
   // Background view.
   NSRect background_rect = NSZeroRect;
   background_rect.size.width = NSWidth(popup_frame);
   background_rect.size.height = NSHeight(popup_frame) -
       NSHeight(top_separator_frame) - NSHeight(bottom_separator_frame);
   background_rect.origin.y = NSMaxY(top_separator_frame);
   [background_view_ setFrame:background_rect];
 
-  // Calculate the width of the table based on backing out the popup's border
+  // In Material Design, the table is the width of the window. In non-MD,
+  // calculate the width of the table based on backing out the popup's border
   // from the width of the field.
-  const CGFloat tableWidth = NSWidth([field_ bounds]);
-  DCHECK_GT(tableWidth, 0.0);
+  CGFloat table_width = NSWidth([background_view_ bounds]);
+  bool is_mode_material = ui::MaterialDesignController::IsModeMaterial();
+  if (!is_mode_material) {
+    table_width = NSWidth([field_ bounds]);
+  }
+  DCHECK_GT(table_width, 0.0);
 
   // Matrix.
   NSPoint field_origin_base =
       [field_ convertPoint:[field_ bounds].origin toView:nil];
   NSRect matrix_frame = NSZeroRect;
-  matrix_frame.origin.x = field_origin_base.x - NSMinX(anchor_rect_base);
-  matrix_frame.origin.y = kPopupPaddingVertical;
-  matrix_frame.size.width = tableWidth;
+  matrix_frame.origin.x = 0;
+  if (!is_mode_material) {
+    matrix_frame.origin.x = field_origin_base.x - NSMinX(anchor_rect_base);
+  } else {
+    [matrix_ setContentLeftPadding:field_origin_base.x];
+  }
+  matrix_frame.origin.y = PopupPaddingVertical();
+  matrix_frame.size.width = table_width;
   matrix_frame.size.height = matrixHeight;
   [matrix_ setFrame:matrix_frame];
-  [[[matrix_ tableColumns] objectAtIndex:0] setWidth:tableWidth];
+  [[[matrix_ tableColumns] objectAtIndex:0] setWidth:table_width];
 
   // Don't play animation games on first display.
   target_popup_frame_ = popup_frame;
   if (![popup_ parentWindow]) {
     DCHECK(![popup_ isVisible]);
     [popup_ setFrame:popup_frame display:NO];
     [[field_ window] addChildWindow:popup_ ordered:NSWindowAbove];
     return;
   }
   DCHECK([popup_ isVisible]);
@@ skipping 35 matching lines @@
   [NSAnimationContext endGrouping];
 
   if (!animate) {
     // Restore the original animations dictionary.  This does not reinstate any
     // previously running animations.
     [popup_ setAnimations:savedAnimations];
   }
 }
 
 NSImage* OmniboxPopupViewMac::ImageForMatch(
-    const AutocompleteMatch& match) const {
+    const AutocompleteMatch& match,
+    BOOL ignore_dark_theme) const {
   gfx::Image image = model_->GetIconIfExtensionMatch(match);
   if (!image.IsEmpty())
     return image.AsNSImage();
 
-  const int resource_id = model_->IsStarredMatch(match) ?
-      IDR_OMNIBOX_STAR : AutocompleteMatch::TypeToIcon(match.type);
-  return OmniboxViewMac::ImageForResource(resource_id);
+  if (!ui::MaterialDesignController::IsModeMaterial()) {
+    const int resource_id = model_->IsStarredMatch(match) ?
+        IDR_OMNIBOX_STAR : AutocompleteMatch::TypeToIcon(match.type);
+    return OmniboxViewMac::ImageForResource(resource_id);
+  }
+  bool is_dark_mode = !ignore_dark_theme && [matrix_ hasDarkTheme];
+  const SkColor icon_color =
+      is_dark_mode ? SkColorSetA(SK_ColorWHITE, 0xCC) : gfx::kChromeIconGrey;
+  const gfx::VectorIconId vector_icon_id = model_->IsStarredMatch(match)
+      ? gfx::VectorIconId::LOCATION_BAR_STAR
+      : AutocompleteMatch::TypeToVectorIcon(match.type);
+  const int kIconSize = 16;
+  return NSImageFromImageSkia(gfx::CreateVectorIcon(vector_icon_id,
+                                                    kIconSize,
+                                                    icon_color));
 }
 
 void OmniboxPopupViewMac::OpenURLForRow(size_t row,
                                         WindowOpenDisposition disposition) {
   DCHECK_LT(row, GetResult().size());
   omnibox_view_->OpenMatch(GetResult().match_at(row), disposition, GURL(),
                            base::string16(), row);
 }