Commit 37e98220 authored by Wei Li's avatar Wei Li Committed by Commit Bot

Remove manual Layout() from SadTabView

The manual layout doesn't actually have any effect since
View::Layout() is always called at the end to invoke layout
manager to do the actual layout.

BUG=1005568

Change-Id: I7821d5dcdc8aa6a4fd52c71a2847dd111e203094
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/1867229
Commit-Queue: Peter Kasting <pkasting@chromium.org>
Reviewed-by: default avatarPeter Kasting <pkasting@chromium.org>
Cr-Commit-Position: refs/heads/master@{#709665}
parent 0b4a0218
...@@ -188,6 +188,18 @@ void SadTabView::AttachToWebView() { ...@@ -188,6 +188,18 @@ void SadTabView::AttachToWebView() {
} }
} }
void SadTabView::OnBoundsChanged(const gfx::Rect& previous_bounds) {
// Specify the maximum message and title width explicitly.
const int max_width =
std::min(width() - ChromeLayoutProvider::Get()->GetDistanceMetric(
DISTANCE_UNRELATED_CONTROL_HORIZONTAL) *
2,
kMaxContentWidth);
message_->SizeToFit(max_width);
title_->SizeToFit(max_width);
}
void SadTabView::LinkClicked(views::Link* source, int event_flags) { void SadTabView::LinkClicked(views::Link* source, int event_flags) {
PerformAction(Action::HELP_LINK); PerformAction(Action::HELP_LINK);
} }
...@@ -198,18 +210,6 @@ void SadTabView::ButtonPressed(views::Button* sender, ...@@ -198,18 +210,6 @@ void SadTabView::ButtonPressed(views::Button* sender,
PerformAction(Action::BUTTON); PerformAction(Action::BUTTON);
} }
void SadTabView::Layout() {
// Specify the maximum message width explicitly.
const int max_width =
std::min(width() - ChromeLayoutProvider::Get()->GetDistanceMetric(
DISTANCE_UNRELATED_CONTROL_HORIZONTAL) * 2, kMaxContentWidth);
message_->SizeToFit(max_width);
title_->SizeToFit(max_width);
View::Layout();
}
void SadTabView::OnPaint(gfx::Canvas* canvas) { void SadTabView::OnPaint(gfx::Canvas* canvas) {
if (!painted_) { if (!painted_) {
RecordFirstPaint(); RecordFirstPaint();
......
...@@ -48,7 +48,7 @@ class SadTabView : public SadTab, ...@@ -48,7 +48,7 @@ class SadTabView : public SadTab,
void ReinstallInWebView() override; void ReinstallInWebView() override;
// Overridden from views::View: // Overridden from views::View:
void Layout() override; void OnBoundsChanged(const gfx::Rect& previous_bounds) override;
// Overridden from views::LinkListener: // Overridden from views::LinkListener:
void LinkClicked(views::Link* source, int event_flags) override; void LinkClicked(views::Link* source, int event_flags) override;
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment