views/controls/label.cc - Issue 6976048: views: Add OnEnabledChanged() method to View class.

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

Unified Diff: views/controls/label.cc

Issue 6976048: views: Add OnEnabledChanged() method to View class. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src

Patch Set: fix win, move OnEnabledChanged to protected section, add comment Created 9 years, 7 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:

Index: views/controls/label.cc

diff --git a/views/controls/label.cc b/views/controls/label.cc

index 627dd98bab7b7be0f2300e4bc769e1b69cb95ab1..62e2060cf43eda2b098a1612c73ce4f8ca2557a7 100644

--- a/views/controls/label.cc

+++ b/views/controls/label.cc

@@ -206,11 +206,9 @@ int Label::GetHeightForWidth(int w) {

return h + GetInsets().height();

}

-void Label::SetEnabled(bool enabled) {

- if (enabled == enabled_)

- return;

- View::SetEnabled(enabled);

- SetColor(enabled ? kEnabledColor : kDisabledColor);

+void Label::OnEnabledChanged() {

+ View::OnEnabledChanged();

+ SetColor(View::IsEnabled() ? kEnabledColor : kDisabledColor);

}

std::string Label::GetClassName() const {