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

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

Index: chrome/browser/ui/views/location_bar/location_bar_view.cc
diff --git a/chrome/browser/ui/views/location_bar/location_bar_view.cc b/chrome/browser/ui/views/location_bar/location_bar_view.cc
index 1946e31d9e4283e5262bb20c56dfe63b8408d7ef..0cfb3ebbc680453495112a2d82ae8a8ba3edd3e0 100644
--- a/chrome/browser/ui/views/location_bar/location_bar_view.cc
+++ b/chrome/browser/ui/views/location_bar/location_bar_view.cc
@@ -71,7 +71,6 @@
 #include "extensions/common/feature_switch.h"
 #include "ui/accessibility/ax_view_state.h"
 #include "ui/base/dragdrop/drag_drop_types.h"
-#include "ui/base/material_design/material_design_controller.h"
 #include "ui/base/resource/resource_bundle.h"
 #include "ui/base/theme_provider.h"
 #include "ui/compositor/paint_recorder.h"
@@ -173,22 +172,10 @@ void LocationBarView::Init() {
   // not prepared for that.
   DCHECK(GetWidget());
 
-  if (ui::MaterialDesignController::IsModeMaterial()) {
-    // Make sure children with layers are clipped. See http://crbug.com/589497
-    SetPaintToLayer(true);
-    layer()->SetFillsBoundsOpaquely(false);
-    layer()->SetMasksToBounds(true);
-  } else if (is_popup_mode_) {
-    const int kOmniboxPopupBorderImages[] =
-        IMAGE_GRID(IDR_OMNIBOX_POPUP_BORDER_AND_SHADOW);
-    border_painter_.reset(
-        views::Painter::CreateImageGridPainter(kOmniboxPopupBorderImages));
-  } else {
-    ui::ResourceBundle& rb = ui::ResourceBundle::GetSharedInstance();
-    const gfx::Insets omnibox_border_insets(14, 9);
-    border_painter_.reset(views::Painter::CreateImagePainter(
-        *rb.GetImageSkiaNamed(IDR_OMNIBOX_BORDER), omnibox_border_insets));
-  }
+  // Make sure children with layers are clipped. See http://crbug.com/589497
+  SetPaintToLayer(true);
+  layer()->SetFillsBoundsOpaquely(false);
+  layer()->SetMasksToBounds(true);
 
   // Determine the main font.
   gfx::FontList font_list = ResourceBundle::GetSharedInstance().GetFontList(
@@ -211,15 +198,10 @@ void LocationBarView::Init() {
       GetLayoutConstant(LOCATION_BAR_BUBBLE_VERTICAL_PADDING) +
       GetLayoutConstant(LOCATION_BAR_BUBBLE_FONT_VERTICAL_PADDING);
   const int bubble_height = location_height - (bubble_padding * 2);
-  gfx::FontList bubble_font_list =
-      font_list.DeriveWithHeightUpperBound(bubble_height);
-  gfx::FontList chip_font_list = ui::MaterialDesignController::IsModeMaterial()
-                                     ? font_list
-                                     : bubble_font_list;
+  gfx::FontList chip_font_list = font_list;

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

Nit: Just use |font_list| below directly

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

Done.

 
   const SkColor background_color = GetColor(BACKGROUND);
-  location_icon_view_ =
-      new LocationIconView(chip_font_list, background_color, this);
+  location_icon_view_ = new LocationIconView(chip_font_list, this);
   location_icon_view_->set_drag_controller(this);
   AddChildView(location_icon_view_);
 
@@ -244,9 +226,7 @@ void LocationBarView::Init() {
   ime_inline_autocomplete_view_->SetVisible(false);
   AddChildView(ime_inline_autocomplete_view_);
 
-  const SkColor selected_text_color = GetColor(TEXT);
-  selected_keyword_view_ = new SelectedKeywordView(
-      chip_font_list, selected_text_color, background_color, profile());
+  selected_keyword_view_ = new SelectedKeywordView(chip_font_list, profile());
   AddChildView(selected_keyword_view_);
 
   suggested_text_view_ = new views::Label(base::string16(), font_list);
@@ -257,6 +237,8 @@ void LocationBarView::Init() {
   suggested_text_view_->SetVisible(false);
   AddChildView(suggested_text_view_);
 
+  gfx::FontList bubble_font_list =
+      font_list.DeriveWithHeightUpperBound(bubble_height);
   keyword_hint_view_ = new KeywordHintView(
       profile(), font_list, bubble_font_list, location_height,
       GetColor(LocationBarView::DEEMPHASIZED_TEXT), background_color);
@@ -266,8 +248,8 @@ void LocationBarView::Init() {
       ContentSettingImageModel::GenerateContentSettingImageModels();
   for (ContentSettingImageModel* model : models.get()) {
     // ContentSettingImageView takes ownership of its model.
-    ContentSettingImageView* image_view = new ContentSettingImageView(
-        model, this, chip_font_list, background_color);
+    ContentSettingImageView* image_view =
+        new ContentSettingImageView(model, this, chip_font_list);
     content_setting_views_.push_back(image_view);
     image_view->SetVisible(false);
     AddChildView(image_view);
@@ -327,10 +309,7 @@ SkColor LocationBarView::GetColor(
       return color_utils::AlphaBlend(GetColor(TEXT), GetColor(BACKGROUND), 128);
 
     case SECURITY_CHIP_TEXT:
-      return ui::MaterialDesignController::IsModeMaterial()
-                 ? GetSecureTextColor(
-                       GetToolbarModel()->GetSecurityLevel(false))
-                 : SkColorSetRGB(7, 149, 0);
+      return GetSecureTextColor(GetToolbarModel()->GetSecurityLevel(false));
   }
   NOTREACHED();
   return gfx::kPlaceholderColor;
@@ -347,19 +326,12 @@ SkColor LocationBarView::GetSecureTextColor(
   if ((security_level == security_state::SecurityStateModel::EV_SECURE) ||
       (security_level == security_state::SecurityStateModel::SECURE) ||
       (security_level == security_state::SecurityStateModel::SECURITY_ERROR)) {
-    if (ui::MaterialDesignController::IsModeMaterial()) {
-      if (color_utils::IsDark(GetColor(BACKGROUND)))
-        return text_color;
-      if (security_level == security_state::SecurityStateModel::SECURITY_ERROR)
-        text_color = gfx::kGoogleRed700;
-      else
-        text_color = gfx::kGoogleGreen700;
-    } else if (security_level ==
-               security_state::SecurityStateModel::SECURITY_ERROR) {
-      text_color = SkColorSetRGB(162, 0, 0);
-    } else {
-      text_color = GetColor(SECURITY_CHIP_TEXT);
-    }
+    if (color_utils::IsDark(GetColor(BACKGROUND)))
+      return text_color;
+    text_color =
+        (security_level == security_state::SecurityStateModel::SECURITY_ERROR)
+            ? gfx::kGoogleRed700
+            : gfx::kGoogleGreen700;
   }

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

Nit: If we pull out the SECURITY_ERROR case we can save a line:

  const bool is_security_error =
      (security_level == security_state::SecurityStateModel::SECURITY_ERROR);
  if (is_security_error ||
      (security_level == security_state::SecurityStateModel::EV_SECURE) ||
      (security_level == security_state::SecurityStateModel::SECURE)) {
    if (color_utils::IsDark(GetColor(BACKGROUND)))
      return text_color;
    text_color = is_security_error ? gfx::kGoogleRed700 : gfx::kGoogleGreen700;
  }

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

refactored slightly so we don't have to make that comparison twice (or store it
in a local variable)

[Peter Kasting, 2016/09/20 20:18:05]

Technically this is a behavior change since we now run through
GetReadableColor() for the IsDark() case, but that's probably a good change,
since if it could have any effect, we'd _want_ the effect.

[Evan Stade, 2016/09/21 17:05:00]

yea. I actually think we shouldn't have to call GetReadableColor here ---
concretely, when could it change the color? But it seems safer to leave it if
someone decided it was necessary at some point.

   return color_utils::GetReadableColor(text_color, GetColor(BACKGROUND));
 }
@@ -421,13 +393,8 @@ gfx::Point LocationBarView::GetOmniboxViewOrigin() const {
 }
 
 int LocationBarView::GetLocationIconWidth() const {
-  if (ui::MaterialDesignController::IsModeMaterial()) {
-    constexpr int kVectorIconSize = 16;
-    return kVectorIconSize;
-  }
-  return GetThemeProvider()->GetImageSkiaNamed(
-             AutocompleteMatch::TypeToIcon(
-                 AutocompleteMatchType::URL_WHAT_YOU_TYPED))->width();
+  constexpr int kVectorIconSize = 16;
+  return kVectorIconSize;

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

Nit: Since this is no longer computed at runtime, could just convert to a public
constexpr in the header (no accessor function needed).

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

Done.

 }
 
 void LocationBarView::SetImeInlineAutocompletion(const base::string16& text) {
@@ -477,8 +444,6 @@ void LocationBarView::GetOmniboxPopupPositioningInfo(
 
   *popup_width = parent()->width();
   gfx::Rect location_bar_bounds(bounds());

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

Nit: Just use x() and bounds.right() directly below

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

Done.

-  if (!ui::MaterialDesignController::IsModeMaterial())
-    location_bar_bounds.Inset(GetHorizontalEdgeThickness(), 0);
   *left_margin = location_bar_bounds.x();
   *right_margin = *popup_width - location_bar_bounds.right();
 }
@@ -514,11 +479,7 @@ void LocationBarView::GetAccessibleState(ui::AXViewState* state) {
 gfx::Size LocationBarView::GetPreferredSize() const {
   // Compute minimum height.
   gfx::Size min_size;
-  if (ui::MaterialDesignController::IsModeMaterial() || is_popup_mode_) {
-    min_size.set_height(GetLayoutConstant(LOCATION_BAR_HEIGHT));
-  } else {
-    min_size = border_painter_->GetMinimumSize();
-  }
+  min_size.set_height(GetLayoutConstant(LOCATION_BAR_HEIGHT));

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

Nit: Maybe:

  gfx::Size min_size(0, GetLayoutConstant(LOCATION_BAR_HEIGHT));

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

Done.

 
   if (!IsInitialized())
     return min_size;
@@ -591,7 +552,6 @@ void LocationBarView::Layout() {
   const int location_height = std::max(height() - (vertical_padding * 2), 0);
 
   location_icon_view_->SetLabel(base::string16());
-  location_icon_view_->SetBackground(false);
   if (ShouldShowKeywordBubble()) {
     leading_decorations.AddDecoration(vertical_padding, location_height, true,
                                       0, bubble_horizontal_padding,
@@ -606,15 +566,12 @@ void LocationBarView::Layout() {
         gfx::Image image = extensions::OmniboxAPI::Get(profile())->
             GetOmniboxIcon(template_url->GetExtensionId());
         selected_keyword_view_->SetImage(image.AsImageSkia());
-        selected_keyword_view_->set_is_extension_icon(true);
       } else {
         selected_keyword_view_->ResetImage();
-        selected_keyword_view_->set_is_extension_icon(false);
       }
     }
   } else if (ShouldShowSecurityChip()) {
     location_icon_view_->SetLabel(GetSecurityText());
-    location_icon_view_->SetBackground(true);
     // The largest fraction of the omnibox that can be taken by the EV bubble.
     const double kMaxBubbleFraction = 0.5;
     leading_decorations.AddDecoration(
@@ -774,12 +731,10 @@ void LocationBarView::Layout() {
 }
 
 void LocationBarView::OnNativeThemeChanged(const ui::NativeTheme* theme) {
-  if (ui::MaterialDesignController::IsModeMaterial()) {
-    RefreshLocationIcon();
-    if (!is_popup_mode_) {
-      set_background(new BackgroundWith1PxBorder(GetColor(BACKGROUND),
-                                                 kBorderColor));
-    }
+  RefreshLocationIcon();
+  if (!is_popup_mode_) {
+    set_background(
+        new BackgroundWith1PxBorder(GetColor(BACKGROUND), kBorderColor));
   }
 }
 
@@ -841,10 +796,7 @@ int LocationBarView::GetHorizontalEdgeThickness() const {
 }
 
 int LocationBarView::GetVerticalEdgeThickness() const {
-  if (ui::MaterialDesignController::IsModeMaterial())
-    return GetLayoutConstant(LOCATION_BAR_BORDER_THICKNESS);
-  return is_popup_mode_ ? views::NonClientFrameView::kClientEdgeThickness
-                        : GetLayoutConstant(LOCATION_BAR_BORDER_THICKNESS);
+  return GetLayoutConstant(LOCATION_BAR_BORDER_THICKNESS);

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

Nit: At this point I'd inline this into the callers; this might allow us to
rename GetVerticalEdgeThicknessWithPadding() to just GetVerticalEdgeThickness()
(though I'm not 100% sure that's the right thing to do)

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

done, renamed the ...WithPadding fn to GetTotalVerticalPadding.

 }
 
 int LocationBarView::GetVerticalEdgeThicknessWithPadding() const {
@@ -858,19 +810,14 @@ void LocationBarView::RefreshLocationIcon() {
   if (!omnibox_view_)
     return;
 
-  if (ui::MaterialDesignController::IsModeMaterial()) {
-    security_state::SecurityStateModel::SecurityLevel security_level =
-        GetToolbarModel()->GetSecurityLevel(false);
-    SkColor icon_color =
-        (security_level == security_state::SecurityStateModel::NONE)
-            ? color_utils::DeriveDefaultIconColor(GetColor(TEXT))
-            : GetSecureTextColor(security_level);
-    location_icon_view_->SetImage(gfx::CreateVectorIcon(
-        omnibox_view_->GetVectorIcon(), GetLocationIconWidth(), icon_color));
-  } else {
-    location_icon_view_->SetImage(
-        *GetThemeProvider()->GetImageSkiaNamed(omnibox_view_->GetIcon()));
-  }
+  security_state::SecurityStateModel::SecurityLevel security_level =
+      GetToolbarModel()->GetSecurityLevel(false);
+  SkColor icon_color =
+      (security_level == security_state::SecurityStateModel::NONE)
+          ? color_utils::DeriveDefaultIconColor(GetColor(TEXT))
+          : GetSecureTextColor(security_level);
+  location_icon_view_->SetImage(gfx::CreateVectorIcon(
+      omnibox_view_->GetVectorIcon(), GetLocationIconWidth(), icon_color));
 }
 
 bool LocationBarView::RefreshContentSettingViews() {
@@ -1269,22 +1216,20 @@ void LocationBarView::OnFocus() {
 void LocationBarView::OnPaint(gfx::Canvas* canvas) {
   View::OnPaint(canvas);
 
-  if (ui::MaterialDesignController::IsModeMaterial()) {
-    if (show_focus_rect_ && omnibox_view_->HasFocus()) {
-      SkPaint paint;
-      paint.setAntiAlias(true);
-      paint.setColor(GetNativeTheme()->GetSystemColor(
-          ui::NativeTheme::NativeTheme::kColorId_FocusedBorderColor));
-      paint.setStyle(SkPaint::kStroke_Style);
-      paint.setStrokeWidth(1);
-      gfx::RectF focus_rect(GetLocalBounds());
-      focus_rect.Inset(gfx::InsetsF(0.5f));
-      canvas->DrawRoundRect(
-          focus_rect, BackgroundWith1PxBorder::kCornerRadius + 0.5f, paint);
-    }
-    if (!is_popup_mode_)
-      return;  // The background and border are painted by our Background.
+  if (show_focus_rect_ && omnibox_view_->HasFocus()) {
+    SkPaint paint;
+    paint.setAntiAlias(true);
+    paint.setColor(GetNativeTheme()->GetSystemColor(
+        ui::NativeTheme::NativeTheme::kColorId_FocusedBorderColor));
+    paint.setStyle(SkPaint::kStroke_Style);
+    paint.setStrokeWidth(1);
+    gfx::RectF focus_rect(GetLocalBounds());
+    focus_rect.Inset(gfx::InsetsF(0.5f));
+    canvas->DrawRoundRect(focus_rect,
+                          BackgroundWith1PxBorder::kCornerRadius + 0.5f, paint);
   }
+  if (!is_popup_mode_)
+    return;  // The background and border are painted by our Background.
 
   // Fill the location bar background color behind the border.  Parts of the
   // border images are meant to rest atop the toolbar background and parts atop
@@ -1293,41 +1238,12 @@ void LocationBarView::OnPaint(gfx::Canvas* canvas) {
   bounds.Inset(GetHorizontalEdgeThickness(),
                is_popup_mode_ ? 0 : GetVerticalEdgeThickness());
   SkColor background_color(GetColor(BACKGROUND));
-  if (!is_popup_mode_) {
-    SkPaint paint;
-    paint.setStyle(SkPaint::kFill_Style);
-    paint.setColor(background_color);
-    const int kBorderCornerRadius = 2;
-    canvas->DrawRoundRect(bounds, kBorderCornerRadius, paint);
-    // The border itself will be drawn in PaintChildren() since it includes an
-    // inner shadow which should be drawn over the contents.
-    return;
-  }
-
   canvas->FillRect(bounds, background_color);
   const SkColor border_color = GetBorderColor(profile()->IsOffTheRecord());
   BrowserView::Paint1pxHorizontalLine(canvas, border_color, bounds, false);
   BrowserView::Paint1pxHorizontalLine(canvas, border_color, bounds, true);
 }
 
-void LocationBarView::PaintChildren(const ui::PaintContext& context) {
-  View::PaintChildren(context);
-  ui::PaintRecorder recorder(context, size());
-
-  // For non-InstantExtendedAPI cases, if necessary, show focus rect. As we need
-  // the focus rect to appear on top of children we paint here rather than
-  // OnPaint().
-  // Note: |Canvas::DrawFocusRect| paints a dashed rect with gray color.
-  if (!ui::MaterialDesignController::IsModeMaterial() && show_focus_rect_ &&
-      HasFocus())
-    recorder.canvas()->DrawFocusRect(omnibox_view_->bounds());
-
-  if (!ui::MaterialDesignController::IsModeMaterial() && !is_popup_mode_) {
-    views::Painter::PaintPainterAt(recorder.canvas(), border_painter_.get(),
-                                   GetContentsBounds());
-  }
-}
-
 ////////////////////////////////////////////////////////////////////////////////
 // LocationBarView, private views::DragController implementation: