Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(160)

Unified Diff: ash/common/system/tray/fixed_sized_scroll_view.cc

Issue 2671063002: Remove FixedSizedScrollView. (Closed)
Patch Set: rebase Created 3 years, 10 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « ash/common/system/tray/fixed_sized_scroll_view.h ('k') | ash/common/system/tray/tray_details_view.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: ash/common/system/tray/fixed_sized_scroll_view.cc
diff --git a/ash/common/system/tray/fixed_sized_scroll_view.cc b/ash/common/system/tray/fixed_sized_scroll_view.cc
deleted file mode 100644
index 1959fd654cff71c227a83fedb2544e9391153486..0000000000000000000000000000000000000000
--- a/ash/common/system/tray/fixed_sized_scroll_view.cc
+++ /dev/null
@@ -1,85 +0,0 @@
-// Copyright 2013 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/fixed_sized_scroll_view.h"
-
-#include "ash/common/material_design/material_design_controller.h"
-
-namespace ash {
-
-namespace {
-
-bool UseMd() {
- return MaterialDesignController::IsSystemTrayMenuMaterial();
-}
-
-} // namespace
-
-FixedSizedScrollView::FixedSizedScrollView() {
- set_notify_enter_exit_on_child(true);
-}
-
-FixedSizedScrollView::~FixedSizedScrollView() {}
-
-void FixedSizedScrollView::SetContentsView(views::View* view) {
- SetContents(view);
- if (!UseMd())
- view->SetBoundsRect(gfx::Rect(view->GetPreferredSize()));
-}
-
-void FixedSizedScrollView::SetFixedSize(const gfx::Size& size) {
- DCHECK(!UseMd());
- if (fixed_size_ == size)
- return;
- fixed_size_ = size;
- PreferredSizeChanged();
-}
-
-void FixedSizedScrollView::set_fixed_size(const gfx::Size& size) {
- DCHECK(!UseMd());
- fixed_size_ = size;
-}
-
-gfx::Size FixedSizedScrollView::GetPreferredSize() const {
- if (UseMd())
- return views::View::GetPreferredSize();
-
- gfx::Size size =
- fixed_size_.IsEmpty() ? contents()->GetPreferredSize() : fixed_size_;
- gfx::Insets insets = GetInsets();
- size.Enlarge(insets.width(), insets.height());
- return size;
-}
-
-void FixedSizedScrollView::Layout() {
- if (UseMd())
- return views::ScrollView::Layout();
-
- gfx::Rect bounds = gfx::Rect(contents()->GetPreferredSize());
- bounds.set_width(std::max(0, width() - GetScrollBarLayoutWidth()));
- // Keep the origin of the contents unchanged so that the list will not scroll
- // away from the current visible region user is viewing. ScrollView::Layout()
- // will make sure the contents line up with its viewport properly if
- // the contents moves out of the viewport region.
- bounds.set_origin(contents()->origin());
- contents()->SetBoundsRect(bounds);
-
- views::ScrollView::Layout();
- if (!vertical_scroll_bar()->visible()) {
- gfx::Rect bounds = contents()->bounds();
- bounds.set_width(bounds.width() + GetScrollBarLayoutWidth());
- contents()->SetBoundsRect(bounds);
- }
-}
-
-void FixedSizedScrollView::OnBoundsChanged(const gfx::Rect& previous_bounds) {
- if (UseMd())
- return;
-
- gfx::Rect bounds = gfx::Rect(contents()->GetPreferredSize());
- bounds.set_width(std::max(0, width() - GetScrollBarLayoutWidth()));
- contents()->SetBoundsRect(bounds);
-}
-
-} // namespace ash
« no previous file with comments | « ash/common/system/tray/fixed_sized_scroll_view.h ('k') | ash/common/system/tray/tray_details_view.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698