Remove pre-MD infobar code (on Views).

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

 // Copyright (c) 2011 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/infobars/infobar_container_view.h"
 
 #include "chrome/browser/ui/infobar_container_delegate.h"
 #include "chrome/browser/ui/view_ids.h"
 #include "chrome/browser/ui/views/infobars/infobar_view.h"
 #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"
 
 namespace {
 
 // The content shadow is drawn in two stages. A darker, shorter shadow is
 // blended with a taller, lighter shadow. The heights are in dp.
 const int kSmallShadowHeight = 1;
 const int kLargeShadowHeight = 3;
@@ skipping 35 matching lines @@
 };
 
 }  // namespace
 
 // static
 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() {
   RemoveAllInfoBarsForDestruction();
 }
 
 gfx::Size InfoBarContainerView::GetPreferredSize() const {
   int total_height;
   int overlap = GetVerticalOverlap(&total_height);
   total_height -= overlap;
 
   // 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)
     size.SetToMax(gfx::Size(child_at(i)->GetPreferredSize().width(), 0));
   return size;
 }
 
 const char* InfoBarContainerView::GetClassName() const {
   return kViewClassName;
 }
 
 void InfoBarContainerView::Layout() {
   int top = 0;
 
   for (int i = 0; i < child_count(); ++i) {
     if (child_at(i) == content_shadow_)
       continue;
 
     InfoBarView* child = static_cast<InfoBarView*>(child_at(i));
     top -= child->arrow_height();
     int child_height = child->total_height();
 
     // 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) {
   state->role = ui::AX_ROLE_GROUP;
   state->name = l10n_util::GetStringUTF16(IDS_ACCNAME_INFOBAR_CONTAINER);
 }
 
 void InfoBarContainerView::PlatformSpecificAddInfoBar(
     infobars::InfoBar* infobar,
     size_t position) {
   AddChildViewAt(static_cast<InfoBarView*>(infobar),
                  static_cast<int>(position));
 }
 
 void InfoBarContainerView::PlatformSpecificRemoveInfoBar(
     infobars::InfoBar* infobar) {
   RemoveChildView(static_cast<InfoBarView*>(infobar));
 }