cocoa browser: remove non-material omnibox support

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"
@@ skipping 18 matching lines @@
 #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.
 CGFloat PopupPaddingVertical() {
-  if (!ui::MaterialDesignController::IsModeMaterial()) {
-    return kPopupPaddingVertical;
-  }
   return kMaterialPopupPaddingVertical;
 }
 
 // Animation duration when animating the popup window smaller.
 const NSTimeInterval kShrinkAnimationDuration = 0.1;
 
 }  // namespace
 
 OmniboxPopupViewMac::OmniboxPopupViewMac(OmniboxView* omnibox_view,
                                          OmniboxEditModel* edit_model,
@@ skipping 121 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];
+    BOOL is_dark_theme = [[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(is_dark_theme)];
     [background_view_ setContentViewMargins:NSZeroSize];
     [contentView addSubview:background_view_];
 
     matrix_.reset([[OmniboxPopupMatrix alloc] initWithObserver:this
@@ skipping 54 matching lines @@
   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];
 
   // 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.
   CGFloat table_width = NSWidth([[[field_ window] contentView] 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 = 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_ 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:table_width];
 
   // Don't play animation games on first display.
   target_popup_frame_ = popup_frame;
   if (![popup_ parentWindow]) {
     DCHECK(![popup_ isVisible]);
@@ skipping 45 matching lines @@
     [popup_ setAnimations:savedAnimations];
   }
 }
 
 NSImage* OmniboxPopupViewMac::ImageForMatch(
     const AutocompleteMatch& match) const {
   gfx::Image image = model_->GetIconIfExtensionMatch(match);
   if (!image.IsEmpty())
     return image.AsNSImage();
 
-  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 = [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);
 }