Remove pre-MD infobar code (on Views).

chrome/browser/ui/views/infobars/infobar_container_view.cc

Index: chrome/browser/ui/views/infobars/infobar_container_view.cc
diff --git a/chrome/browser/ui/views/infobars/infobar_container_view.cc b/chrome/browser/ui/views/infobars/infobar_container_view.cc
index 354393d1706c98e8ab9b46d2a7200d27a8760332..2bef3e146038259fee4933e59890770938207ffe 100644
--- a/chrome/browser/ui/views/infobars/infobar_container_view.cc
+++ b/chrome/browser/ui/views/infobars/infobar_container_view.cc
@@ -10,7 +10,6 @@
 #include "chrome/grit/generated_resources.h"
 #include "ui/accessibility/ax_view_state.h"
 #include "ui/base/l10n/l10n_util.h"
-#include "ui/base/material_design/material_design_controller.h"
 #include "ui/gfx/canvas.h"
 #include "ui/gfx/skia_util.h"
 #include "ui/views/view_targeter.h"
@@ -66,10 +65,8 @@ const char InfoBarContainerView::kViewClassName[] = "InfoBarContainerView";
 InfoBarContainerView::InfoBarContainerView(Delegate* delegate)
     : infobars::InfoBarContainer(delegate), content_shadow_(nullptr) {
   set_id(VIEW_ID_INFO_BAR_CONTAINER);
-  if (ui::MaterialDesignController::IsModeMaterial()) {
-    content_shadow_ = new ContentShadow();
-    AddChildView(content_shadow_);
-  }
+  content_shadow_ = new ContentShadow();

[Peter Kasting, 2016/09/19 19:04:06]

Nit: Might as well do this in the initializer list

[Evan Stade, 2016/09/19 20:06:02]

Done.

+  AddChildView(content_shadow_);
 }
 
 InfoBarContainerView::~InfoBarContainerView() {
@@ -83,8 +80,7 @@ gfx::Size InfoBarContainerView::GetPreferredSize() const {
 
   // No need to reserve space for the bottom bar's separator; the shadow is good
   // enough.
-  if (ui::MaterialDesignController::IsModeMaterial())
-    total_height -= InfoBarContainerDelegate::kSeparatorLineHeight;
+  total_height -= InfoBarContainerDelegate::kSeparatorLineHeight;

[Peter Kasting, 2016/09/19 19:04:06]

Should we be doing this in GetVerticalOverlap() instead?

[Evan Stade, 2016/09/19 20:06:02]

I'd be worried about affecting mac.

[Peter Kasting, 2016/09/19 20:12:48]

Hmm.  It would be nice to at least know how Mac was affected so we could TODO
properly, or maybe Mac's current behavior is actually wrong and should just be
fixed?  I don't want to make you fix Mac but at the same time I'm worried that
we'll end up leaving this.

[Evan Stade, 2016/09/19 20:25:21]

filed a bug for these two things

 
   gfx::Size size(0, total_height);
   for (int i = 0; i < child_count(); ++i)
@@ -110,16 +106,13 @@ void InfoBarContainerView::Layout() {
     // Trim off the bottom bar's separator; the shadow is good enough.
     // The last infobar is the second to last child overall (followed by
     // |content_shadow_|).
-    if (ui::MaterialDesignController::IsModeMaterial() &&
-        i == child_count() - 2) {
+    if (i == child_count() - 2)
       child_height -= InfoBarContainerDelegate::kSeparatorLineHeight;
-    }
     child->SetBounds(0, top, width(), child_height);
     top += child_height;
   }
 
-  if (ui::MaterialDesignController::IsModeMaterial())
-    content_shadow_->SetBounds(0, top, width(), kLargeShadowHeight);
+  content_shadow_->SetBounds(0, top, width(), kLargeShadowHeight);
 }
 
 void InfoBarContainerView::GetAccessibleState(ui::AXViewState* state) {