Remove non-md code in location bar (Views).

chrome/browser/ui/views/location_bar/location_icon_view.cc

 // 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/views/location_bar/location_icon_view.h"
 
 #include "base/strings/utf_string_conversions.h"
 #include "chrome/browser/ssl/chrome_security_state_model_client.h"
 #include "chrome/browser/ui/view_ids.h"
 #include "chrome/browser/ui/views/location_bar/location_bar_view.h"
 #include "chrome/browser/ui/views/website_settings/website_settings_popup_view.h"
 #include "chrome/grit/generated_resources.h"
 #include "chrome/grit/theme_resources.h"
 #include "components/grit/components_scaled_resources.h"
 #include "components/omnibox/browser/omnibox_edit_model.h"
 #include "content/public/browser/navigation_controller.h"
 #include "content/public/browser/navigation_entry.h"
 #include "content/public/browser/web_contents.h"
 #include "ui/base/l10n/l10n_util.h"
-#include "ui/base/material_design/material_design_controller.h"
 #include "ui/gfx/color_palette.h"
 #include "ui/views/controls/label.h"
 #include "ui/views/painter.h"
 
 using content::NavigationEntry;
 using content::WebContents;
 
 LocationIconView::LocationIconView(const gfx::FontList& font_list,
-                                   SkColor parent_background_color,
                                    LocationBarView* location_bar)
-    : IconLabelBubbleView(IDR_OMNIBOX_HTTPS_INVALID,
-                          font_list,
-                          parent_background_color,
-                          true),
+    : IconLabelBubbleView(font_list, true),
       suppress_mouse_released_action_(false),
       location_bar_(location_bar),
       animation_(this) {
   set_id(VIEW_ID_LOCATION_ICON);
 
 #if defined(OS_MACOSX)
   SetFocusBehavior(FocusBehavior::ACCESSIBLE_ONLY);
 #else
   SetFocusBehavior(FocusBehavior::ALWAYS);
 #endif
 
-  SetBackground(false);
   animation_.SetSlideDuration(kOpenTimeMS);
 }
 
 LocationIconView::~LocationIconView() {
 }
 
 gfx::Size LocationIconView::GetMinimumSize() const {
   return GetMinimumSizeForPreferredSize(GetPreferredSize());
 }
 
@@ skipping 41 matching lines @@
 }
 
 bool LocationIconView::GetTooltipText(const gfx::Point& p,
                                       base::string16* tooltip) const {
   if (show_tooltip_)
     *tooltip = l10n_util::GetStringUTF16(IDS_TOOLTIP_LOCATION_ICON);
   return show_tooltip_;
 }
 
 SkColor LocationIconView::GetTextColor() const {
+  NOTIMPLEMENTED() << " HITTING THIS";

[Peter Kasting, 2016/09/19 23:46:46]

Um.

Should we ever reach here?  Maybe the right thing to do is to remove this
method?

[Evan Stade, 2016/09/20 17:37:04]

oops

yes we need this function still. We don't need GetBorderColor though (there are
no borders any more and the separator is based on default textfield color).

   return location_bar_->GetColor(LocationBarView::SECURITY_CHIP_TEXT);
 }
 
 SkColor LocationIconView::GetBorderColor() const {
   return GetTextColor();
 }
 
 bool LocationIconView::OnActivate(const ui::Event& event) {
   WebContents* contents = location_bar_->GetWebContents();
   if (!contents)
@@ skipping 14 matching lines @@
   return true;
 }
 
 gfx::Size LocationIconView::GetMinimumSizeForLabelText(
     const base::string16& text) const {
   views::Label label(text, font_list());
   return GetMinimumSizeForPreferredSize(
       GetSizeForLabelWidth(label.GetPreferredSize().width()));
 }
 
-void LocationIconView::SetBackground(bool should_show_ev) {
-  static const int kEvBackgroundImages[] = IMAGE_GRID(IDR_OMNIBOX_EV_BUBBLE);
-  if (should_show_ev)
-    SetBackgroundImageGrid(kEvBackgroundImages);
-  else
-    UnsetBackgroundImageGrid();
-}
-
 void LocationIconView::SetSecurityState(bool should_show, bool should_animate) {
   if (!should_animate) {
     animation_.Reset(should_show);
   } else if (should_show) {
     animation_.Show();
   } else {
     animation_.Hide();
   }
+  // The label text color may have changed.
+  OnNativeThemeChanged(GetNativeTheme());

[Peter Kasting, 2016/09/19 23:46:46]

Is this a bugfix?

[Evan Stade, 2016/09/20 17:37:04]

no. It worked before because this line was in SetBackgroundImageGrid.

 }
 
 double LocationIconView::WidthMultiplier() const {
   return animation_.GetCurrentValue();
 }
 
 void LocationIconView::AnimationProgressed(const gfx::Animation*) {
   location_bar_->Layout();
   location_bar_->SchedulePaint();
 }
@@ skipping 11 matching lines @@
   return size;
 }
 
 void LocationIconView::OnClickOrTap(const ui::LocatedEvent& event) {
   // Do not show page info if the user has been editing the location bar or the
   // location bar is at the NTP.
   if (location_bar_->GetOmniboxView()->IsEditingOrEmpty())
     return;
   ProcessLocatedEvent(event);
 }