cocoa browser: remove non-MD location bar support

chrome/browser/ui/cocoa/location_bar/location_bar_view_mac.mm

 // Copyright 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.
 
 #import "chrome/browser/ui/cocoa/location_bar/location_bar_view_mac.h"
 
 #include "base/bind.h"
 #include "base/command_line.h"
 #import "base/mac/mac_util.h"
 #include "base/stl_util.h"
@@ skipping 615 matching lines @@
                             vector_icon_color),
       base::mac::GetSRGBColorSpace());
   location_icon_decoration_->SetImage(image);
   security_state_bubble_decoration_->SetImage(image);
   security_state_bubble_decoration_->SetLabelColor(vector_icon_color);
 
   Layout();
 }
 
 void LocationBarViewMac::UpdateColorsToMatchTheme() {
-  if (!ui::MaterialDesignController::IsModeMaterial() ||
-      ![[field_ window] inIncognitoMode]) {
-    return;
-  }
-
   // Update the location-bar icon.
   UpdateLocationIcon();
 
   // Make sure we're displaying the correct star color for Incognito mode. If
   // the window is in Incognito mode, switching between a theme and no theme
   // can move the window in and out of dark mode.
   star_decoration_->SetStarred(star_decoration_->starred(),
                                IsLocationBarDark());
 
   // Update the appearance of the text in the Omnibox.
   omnibox_view_->Update();
 }
 
 void LocationBarViewMac::OnAddedToWindow() {
   UpdateColorsToMatchTheme();
 }
 
 void LocationBarViewMac::OnThemeChanged() {
   UpdateColorsToMatchTheme();
 }
 
 void LocationBarViewMac::OnChanged() {
-  if (!ui::MaterialDesignController::IsModeMaterial()) {
-    const int resource_id = omnibox_view_->GetIcon();
-    NSImage* image = OmniboxViewMac::ImageForResource(resource_id);
-    location_icon_decoration_->SetImage(image);
-    security_state_bubble_decoration_->SetImage(image);
-    Layout();
-    return;
-  }
   UpdateSecurityState(false);
   UpdateLocationIcon();
 }
 
 ToolbarModel* LocationBarViewMac::GetToolbarModel() {
   return browser_->toolbar_model();
 }
 
 const ToolbarModel* LocationBarViewMac::GetToolbarModel() const {
   return browser_->toolbar_model();
 }
 
 WebContents* LocationBarViewMac::GetWebContents() {
   return browser_->tab_strip_model()->GetActiveWebContents();
 }
 
 bool LocationBarViewMac::ShouldShowEVBubble() const {
   return (GetToolbarModel()->GetSecurityLevel(false) ==
           security_state::SecurityStateModel::EV_SECURE) &&
          should_show_secure_verbose_;
 }
 
 bool LocationBarViewMac::ShouldShowSecurityState() const {
   security_state::SecurityStateModel::SecurityLevel security =
       GetToolbarModel()->GetSecurityLevel(false);
   bool has_verbose_for_security =
       security == security_state::SecurityStateModel::DANGEROUS ||
       (IsSecureConnection(security) && should_show_secure_verbose_);
 
-  return ui::MaterialDesignController::IsModeMaterial() &&
-         has_verbose_for_security && !omnibox_view_->IsEditingOrEmpty() &&
+  return has_verbose_for_security && !omnibox_view_->IsEditingOrEmpty() &&
          !omnibox_view_->model()->is_keyword_hint();
 }
 
 bool LocationBarViewMac::IsLocationBarDark() const {
   return [[field_ window] inIncognitoModeWithSystemTheme];
 }
 
 NSImage* LocationBarViewMac::GetKeywordImage(const base::string16& keyword) {
   const TemplateURL* template_url = TemplateURLServiceFactory::GetForProfile(
       profile())->GetTemplateURLForKeyword(keyword);
   if (template_url &&
       (template_url->type() == TemplateURL::OMNIBOX_API_EXTENSION)) {
     return extensions::OmniboxAPI::Get(profile())->
         GetOmniboxIcon(template_url->GetExtensionId()).AsNSImage();
   }
 
-  if (ui::MaterialDesignController::IsModeMaterial()) {
-    SkColor icon_color = IsLocationBarDark() ? kMaterialDarkVectorIconColor
-                                             : gfx::kGoogleBlue700;
-    return NSImageFromImageSkiaWithColorSpace(
-        gfx::CreateVectorIcon(gfx::VectorIconId::OMNIBOX_SEARCH,
-                              kDefaultIconSize, icon_color),
-        base::mac::GetSRGBColorSpace());
-  }
-
-  return OmniboxViewMac::ImageForResource(IDR_OMNIBOX_SEARCH);
+  SkColor icon_color =
+      IsLocationBarDark() ? kMaterialDarkVectorIconColor : gfx::kGoogleBlue700;
+  return NSImageFromImageSkiaWithColorSpace(
+      gfx::CreateVectorIcon(gfx::VectorIconId::OMNIBOX_SEARCH, kDefaultIconSize,
+                            icon_color),
+      base::mac::GetSRGBColorSpace());
 }
 
 SkColor LocationBarViewMac::GetLocationBarIconColor() const {
   bool in_dark_mode = IsLocationBarDark();
   if (in_dark_mode)
     return kMaterialDarkVectorIconColor;
 
   if (ShouldShowEVBubble())
     return gfx::kGoogleGreen700;
 
@@ skipping 209 matching lines @@
     OnDecorationsChanged();
 }
 
 std::vector<NSView*> LocationBarViewMac::GetDecorationAccessibilityViews() {
   std::vector<LocationBarDecoration*> decorations = GetDecorations();
   std::vector<NSView*> views;
   for (auto* decoration : decorations)
     views.push_back(decoration->GetAccessibilityView());
   return views;
 }