Use overlay scrollbars for the cros system menu.

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_tray.h"
@@ skipping 10 matching lines @@
 #include "ui/views/controls/progress_bar.h"
 #include "ui/views/controls/scroll_view.h"
 #include "ui/views/controls/separator.h"
 #include "ui/views/layout/box_layout.h"
 #include "ui/views/view_targeter.h"
 #include "ui/views/view_targeter_delegate.h"
 
 namespace ash {
 namespace {
 
+bool UseMd() {
+  return MaterialDesignController::IsSystemTrayMenuMaterial();
+}
+
 // A view that is used as ScrollView contents. It supports designating some of
 // 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));
@@ skipping 248 matching lines @@
       title_row_separator_(nullptr),
       scroll_border_(nullptr),
       back_button_(nullptr) {
   SetLayoutManager(new views::BoxLayout(views::BoxLayout::kVertical, 0, 0, 0));
   set_background(views::Background::CreateSolidBackground(kBackgroundColor));
 }
 
 TrayDetailsView::~TrayDetailsView() {}
 
 void TrayDetailsView::OnViewClicked(views::View* sender) {
-  if (!MaterialDesignController::IsSystemTrayMenuMaterial() && title_row_ &&
-      sender == title_row_->content()) {
+  if (!UseMd() && title_row_ && sender == title_row_->content()) {
     TransitionToDefaultView();
     return;
   }
 
   HandleViewClicked(sender);
 }
 
 void TrayDetailsView::ButtonPressed(views::Button* sender,
                                     const ui::Event& event) {
-  if (MaterialDesignController::IsSystemTrayMenuMaterial() &&
-      sender == back_button_) {
+  if (UseMd() && sender == back_button_) {
     TransitionToDefaultView();
     return;
   }
 
   HandleButtonPressed(sender, event);
 }
 
 void TrayDetailsView::CreateTitleRow(int string_id) {
   DCHECK(!title_row_);
   title_row_ = new SpecialPopupRow();
   title_row_->SetTextLabel(string_id, this);
-  if (MaterialDesignController::IsSystemTrayMenuMaterial()) {
+  if (UseMd()) {
     title_row_->SetBorder(views::CreateEmptyBorder(kTitleRowPaddingTop, 0,
                                                    kTitleRowPaddingBottom, 0));
     AddChildViewAt(title_row_, 0);
     // In material design, we use a customized bottom border which is nomally a
     // simple separator (views::Separator) but can be combined with an
     // overlapping progress bar.
     title_row_separator_ = new views::View;
     title_row_separator_->SetLayoutManager(new TitleRowSeparatorLayout);
     views::Separator* separator =
         new views::Separator(views::Separator::HORIZONTAL);
     separator->SetColor(kTitleRowSeparatorBorderColor);
     separator->SetPreferredSize(kTitleRowSeparatorBorderHeight);
     separator->SetBorder(views::CreateEmptyBorder(
         kTitleRowSeparatorHeight - kTitleRowSeparatorBorderHeight, 0, 0, 0));
     title_row_separator_->AddChildView(separator);
     AddChildViewAt(title_row_separator_, 1);
   } else {
     AddChildViewAt(title_row_, child_count());
   }
 
   CreateExtraTitleRowButtons();
 
-  if (MaterialDesignController::IsSystemTrayMenuMaterial())
+  if (UseMd())
     back_button_ = title_row_->AddBackButton(this);
 
   Layout();
 }
 
 void TrayDetailsView::CreateScrollableList() {
   DCHECK(!scroller_);
   scroll_content_ = new ScrollContentsView();
   scroller_ = new FixedSizedScrollView;
   scroller_->SetContentsView(scroll_content_);
@@ skipping 35 matching lines @@
 
 void TrayDetailsView::HandleButtonPressed(views::Button* sender,
                                           const ui::Event& event) {}
 
 void TrayDetailsView::CreateExtraTitleRowButtons() {}
 
 void TrayDetailsView::TransitionToDefaultView() {
   // Cache pointer to owner in this function scope. TrayDetailsView will be
   // deleted after called ShowDefaultView.
   SystemTrayItem* owner = owner_;
-  if (MaterialDesignController::IsSystemTrayMenuMaterial()) {
+  if (UseMd()) {
     if (back_button_ && back_button_->HasFocus())
       owner->set_restore_focus(true);
   } else {
     if (title_row_ && title_row_->content() &&
         title_row_->content()->HasFocus()) {
       owner->set_restore_focus(true);
     }
   }
   owner->system_tray()->ShowDefaultView(BUBBLE_USE_EXISTING);
   owner->set_restore_focus(false);
 }
 
 void TrayDetailsView::Layout() {
   if (bounds().IsEmpty()) {
     views::View::Layout();
     return;
   }
 
   if (scroller_) {
-    scroller_->set_fixed_size(gfx::Size());
-    gfx::Size size = GetPreferredSize();
+    if (UseMd()) {
+      gfx::Size scroller_size = scroll_content_->GetPreferredSize();
+      gfx::Size pref_size = GetPreferredSize();
+      scroller()->ClipHeightTo(
+          0, scroller_size.height() - (pref_size.height() - height()));
+    } else {
+      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_->GetScrollBarWidth(),
-                  scroller_size.height() - (size.height() - height())));
+      // 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_->GetScrollBarWidth(),
+                    scroller_size.height() - (size.height() - height())));
+    }
   }
 
   views::View::Layout();
 
-  if (title_row_ && !MaterialDesignController::IsSystemTrayMenuMaterial()) {
+  if (title_row_ && !UseMd()) {
     // 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);
   }
 }
 
 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