Correct spacing in scroll contents of Ash MD detailed view.

ash/common/system/tray/tray_details_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 "ash/common/system/tray/tray_details_view.h"

[tdanderson, 2016/11/09 18:35:18]

nit: since this will impact all detailed views, please change your BUG= line to
be:

BUG=632102,663199,663457,663461,663154,632025,632115

 
 #include "ash/common/ash_view_ids.h"
 #include "ash/common/material_design/material_design_controller.h"
 #include "ash/common/system/tray/fixed_sized_scroll_view.h"
 #include "ash/common/system/tray/system_tray.h"
 #include "ash/common/system/tray/system_tray_item.h"
 #include "ash/common/system/tray/tray_constants.h"
 #include "base/containers/adapters.h"
 #include "third_party/skia/include/core/SkDrawLooper.h"
 #include "ui/compositor/paint_context.h"
@@ skipping 20 matching lines @@
 // the children as sticky header rows. The sticky header rows are not scrolled
 // above the top of the visible viewport until the next one "pushes" it up and
 // are painted above other children. To indicate that a child is a sticky header
 // row use set_id(VIEW_ID_STICKY_HEADER).
 class ScrollContentsView : public views::View,
                            public views::ViewTargeterDelegate {
  public:
   ScrollContentsView() {
     SetEventTargeter(base::MakeUnique<views::ViewTargeter>(this));
     SetLayoutManager(
-        new views::BoxLayout(views::BoxLayout::kVertical, 0, 0, 1));
+        new views::BoxLayout(views::BoxLayout::kVertical, 0,
+                             UseMd() ? kContentsVerticalSpacingMd : 0,
+                             UseMd() ? 0 : kContentsBetweenChildSpacingNonMd));
   }
   ~ScrollContentsView() override {}
 
  protected:
   // views::View:
   void OnBoundsChanged(const gfx::Rect& previous_bounds) override {
     PositionHeaderRows();
   }
 
   void PaintChildren(const ui::PaintContext& context) override {
@@ skipping 42 matching lines @@
         return ViewTargeterDelegate::TargetForRect(view, local_to_header);
     }
     return ViewTargeterDelegate::TargetForRect(root, rect);
   }
 
  private:
   const int kSeparatorThickness = 1;
   const SkColor kSeparatorColor = SkColorSetA(SK_ColorBLACK, 0x1F);
   const int kShadowOffsetY = 2;
   const int kShadowBlur = 2;
+  const int kContentsVerticalSpacingMd = 4;
+  // TODO(fukino): Remove this constant once we stop maintaining pre-MD design.
+  // crbug.com/614453.
+  const int kContentsBetweenChildSpacingNonMd = 1;
 
   // A structure that keeps the original offset of each header between the
   // calls to Layout() to allow keeping track of which view should be sticky.
   struct Header {
     explicit Header(views::View* view)
         : view(view), natural_offset(view->y()) {}
 
     // A header View that can be decorated as sticky.
     views::View* view;
 
@@ skipping 337 matching lines @@
     if (index < child_count() - 1 && child_at(index + 1) != title_row_)
       scroll_border_->set_visible(true);
     else
       scroll_border_->set_visible(false);
   }
 
   views::View::OnPaintBorder(canvas);
 }
 
 }  // namespace ash