Remove FixedSizedScrollView.

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"
 
 #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_menu_button.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 "ash/common/system/tray/tray_popup_item_style.h"
 #include "ash/common/system/tray/tray_popup_utils.h"
 #include "ash/common/system/tray/tri_view.h"
 #include "base/containers/adapters.h"
 #include "base/memory/ptr_util.h"
 #include "base/timer/timer.h"
@@ skipping 336 matching lines @@
     AddChildViewAt(title_row_, child_count());
   }
 
   CreateExtraTitleRowButtons();
   Layout();
 }
 
 void TrayDetailsView::CreateScrollableList() {
   DCHECK(!scroller_);
   scroll_content_ = new ScrollContentsView();
-  scroller_ = new FixedSizedScrollView;
-  scroller_->SetContentsView(scroll_content_);
+  scroller_ = new views::ScrollView;
+  scroller_->SetContents(scroll_content_);
   // Make the |scroller_| have a layer to clip |scroll_content_|'s children.
   // TODO(varkha): Make the sticky rows work with EnableViewPortLayer().
   scroller_->SetPaintToLayer();
   scroller_->set_background(
       views::Background::CreateSolidBackground(kBackgroundColor));
   scroller_->layer()->SetMasksToBounds(true);
 
   // Note: |scroller_| takes ownership of |scroll_border_|.
   if (!UseMd()) {
     // In MD, the scroller is always the last thing, so this border is
@@ skipping 107 matching lines @@
 
 views::Button* TrayDetailsView::CreateBackButton() {
   DCHECK(UseMd());
   SystemMenuButton* button = new SystemMenuButton(
       this, TrayPopupInkDropStyle::HOST_CENTERED, kSystemMenuArrowBackIcon,
       IDS_ASH_STATUS_TRAY_PREVIOUS_MENU);
   return button;
 }
 
 void TrayDetailsView::Layout() {
-  if (UseMd()) {
-    views::View::Layout();
-    if (scroller_ && !scroller_->is_bounded())
-      scroller_->ClipHeightTo(0, scroller_->height());
-    return;
-  }
-
-  if (bounds().IsEmpty()) {
-    views::View::Layout();
-    return;
-  }
-
-  if (scroller_) {
-    scroller_->set_fixed_size(gfx::Size());
-    gfx::Size size = GetPreferredSize();
-
-    // Set the scroller to fill the space above the bottom row, so that the
-    // bottom row of the detailed view will always stay just above the title
-    // row.
-    gfx::Size scroller_size = scroll_content_->GetPreferredSize();
-    scroller_->set_fixed_size(
-        gfx::Size(width() + scroller_->GetScrollBarLayoutWidth(),
-                  scroller_size.height() - (size.height() - height())));
-  }
-
   views::View::Layout();
-
-  if (title_row_) {
-    // Always make sure the title row is bottom-aligned in non-MD.
-    gfx::Rect fbounds = title_row_->bounds();
-    fbounds.set_y(height() - title_row_->height());
-    title_row_->SetBoundsRect(fbounds);
-  }
+  if (scroller_ && !scroller_->is_bounded())
+    scroller_->ClipHeightTo(0, scroller_->height());
 }
 
 int TrayDetailsView::GetHeightForWidth(int width) const {
   if (!UseMd() || bounds().IsEmpty())
     return views::View::GetHeightForWidth(width);
 
   // The height of the bubble that contains this detailed view is set to
   // the preferred height of the default view, and that determines the
   // initial height of |this|. Always request to stay the same height.
   return height();
 }
 
 void TrayDetailsView::OnPaintBorder(gfx::Canvas* canvas) {
   if (scroll_border_) {
     int index = GetIndexOf(scroller_);
     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