Revert of Some more pre-material cleanups

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

 // Copyright (c) 2012 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_view.h"
 
 #include <algorithm>
 #include <memory>
 #include <utility>
 
@@ skipping 163 matching lines @@
     close_button_->SetIcon(gfx::VectorIconId::BAR_CLOSE);
     close_button_->SetAccessibleName(
         l10n_util::GetStringUTF16(IDS_ACCNAME_CLOSE));
     close_button_->SetFocusForPlatform();
     // Subclasses should already be done adding child views by this point (see
     // related DCHECK in Layout()).
     child_container_->AddChildView(close_button_);
   }
 
   // Ensure the infobar is tall enough to display its contents.
-  int height = InfoBarContainerDelegate::kDefaultBarTargetHeight;
+  int height = InfoBarContainerDelegate::kDefaultBarTargetHeightMd;
   const int kMinimumVerticalPadding = 6;
   for (int i = 0; i < child_container_->child_count(); ++i) {
     const int child_height = child_container_->child_at(i)->height();
     height = std::max(height, child_height + kMinimumVerticalPadding);
   }
   SetBarTargetHeight(height);
 }
 
 void InfoBarView::ButtonPressed(views::Button* sender,
                                 const ui::Event& event) {
@@ skipping 112 matching lines @@
 }
 
 bool InfoBarView::DoesIntersectRect(const View* target,
                                     const gfx::Rect& rect) const {
   DCHECK_EQ(this, target);
   // Only events that intersect the portion below the arrow are interesting.
   gfx::Rect non_arrow_bounds = GetLocalBounds();
   non_arrow_bounds.Inset(0, arrow_height(), 0, 0);
   return rect.Intersects(non_arrow_bounds);
 }