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

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

Index: chrome/browser/ui/views/location_bar/bubble_icon_view.cc
diff --git a/chrome/browser/ui/views/location_bar/bubble_icon_view.cc b/chrome/browser/ui/views/location_bar/bubble_icon_view.cc
index 16c83078f52de61397c6f3cb12b97852adbaa354..184aadc99c968c5f8effbc3e7c3bd63b65e84581 100644
--- a/chrome/browser/ui/views/location_bar/bubble_icon_view.cc
+++ b/chrome/browser/ui/views/location_bar/bubble_icon_view.cc
@@ -6,7 +6,6 @@
 
 #include "chrome/browser/command_updater.h"
 #include "ui/accessibility/ax_view_state.h"
-#include "ui/base/material_design/material_design_controller.h"
 #include "ui/events/event.h"
 #include "ui/gfx/color_palette.h"
 #include "ui/gfx/color_utils.h"
@@ -24,12 +23,8 @@ BubbleIconView::BubbleIconView(CommandUpdater* command_updater, int command_id)
   AddChildView(image_);
   image_->set_interactive(false);
   image_->EnableCanvasFlippingForRTLUI(true);
-  if (ui::MaterialDesignController::IsModeMaterial()) {
-    SetInkDropMode(InkDropMode::ON);
-    SetFocusBehavior(FocusBehavior::ACCESSIBLE_ONLY);
-  } else {
-    image_->SetFocusBehavior(FocusBehavior::ACCESSIBLE_ONLY);
-  }
+  SetInkDropMode(InkDropMode::ON);
+  SetFocusBehavior(FocusBehavior::ACCESSIBLE_ONLY);
 }
 
 BubbleIconView::~BubbleIconView() {}
@@ -183,10 +178,6 @@ gfx::VectorIconId BubbleIconView::GetVectorIcon() const {
   return gfx::VectorIconId::VECTOR_ICON_NONE;
 }
 
-bool BubbleIconView::SetRasterIcon() {
-  return false;
-}
-
 void BubbleIconView::OnBoundsChanged(const gfx::Rect& previous_bounds) {
   views::BubbleDialogDelegateView* bubble = GetBubble();
   if (bubble)
@@ -194,11 +185,7 @@ void BubbleIconView::OnBoundsChanged(const gfx::Rect& previous_bounds) {
 }
 
 void BubbleIconView::UpdateIcon() {
-  if (SetRasterIcon())
-    return;
-
-  const int icon_size =
-      ui::MaterialDesignController::IsModeMaterial() ? 16 : 18;
+  const int icon_size = 16;

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

Nit: Make constexpr, name kConstantStyle... or just inline it

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

Done.

   const ui::NativeTheme* theme = GetNativeTheme();
   SkColor icon_color =
       active_