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

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

 // Copyright 2013 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/bubble_icon_view.h"
 
 #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"
 #include "ui/gfx/paint_vector_icon.h"
 #include "ui/native_theme/native_theme.h"
 #include "ui/views/animation/ink_drop_highlight.h"
 #include "ui/views/bubble/bubble_dialog_delegate.h"
 
 BubbleIconView::BubbleIconView(CommandUpdater* command_updater, int command_id)
     : image_(new views::ImageView()),
       command_updater_(command_updater),
       command_id_(command_id),
       active_(false),
       suppress_mouse_released_action_(false) {
   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() {}
 
 bool BubbleIconView::IsBubbleShowing() const {
   // If the bubble is being destroyed, it's considered showing though it may be
   // already invisible currently.
   return GetBubble() != nullptr;
 }
 
@@ skipping 133 matching lines @@
 void BubbleIconView::ExecuteCommand(ExecuteSource source) {
   OnExecuting(source);
   if (command_updater_)
     command_updater_->ExecuteCommand(command_id_);
 }
 
 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)
     bubble->OnAnchorBoundsChanged();
 }
 
 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_
           ? theme->GetSystemColor(ui::NativeTheme::kColorId_CallToActionColor)
           : GetInkDropBaseColor();
   image_->SetImage(
       gfx::CreateVectorIcon(GetVectorIcon(), icon_size, icon_color));
 }
 
 void BubbleIconView::SetActiveInternal(bool active) {
   if (active_ == active)
     return;
   active_ = active;
   UpdateIcon();
 }