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

Unified Diff: ui/views/controls/textfield/native_textfield_win.cc

Issue 8909002: views: Convert IsEnabled() to just enabled() since it's just a simple accessor. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 9 years 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 | « ui/views/controls/textfield/native_textfield_views.cc ('k') | ui/views/controls/textfield/textfield.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: ui/views/controls/textfield/native_textfield_win.cc
diff --git a/ui/views/controls/textfield/native_textfield_win.cc b/ui/views/controls/textfield/native_textfield_win.cc
index fcc782b4a212b57ef1cbfe1a10c7c8ad59a89615..cdfd94826cd5d0fc027e7f40004ebc8823adea54 100644
--- a/ui/views/controls/textfield/native_textfield_win.cc
+++ b/ui/views/controls/textfield/native_textfield_win.cc
@@ -266,8 +266,8 @@ void NativeTextfieldWin::UpdateIsPassword() {
}
void NativeTextfieldWin::UpdateEnabled() {
- SendMessage(m_hWnd, WM_ENABLE, textfield_->IsEnabled(), 0);
- UpdateAccessibleState(STATE_SYSTEM_UNAVAILABLE, !textfield_->IsEnabled());
+ SendMessage(m_hWnd, WM_ENABLE, textfield_->enabled(), 0);
+ UpdateAccessibleState(STATE_SYSTEM_UNAVAILABLE, !textfield_->enabled());
}
gfx::Insets NativeTextfieldWin::CalculateInsets() {
@@ -860,7 +860,7 @@ void NativeTextfieldWin::OnNCPaint(HRGN region) {
if (base::win::GetVersion() < base::win::VERSION_VISTA) {
part = EP_EDITTEXT;
- if (!textfield_->IsEnabled())
+ if (!textfield_->enabled())
state = ETS_DISABLED;
else if (textfield_->read_only())
state = ETS_READONLY;
@@ -871,7 +871,7 @@ void NativeTextfieldWin::OnNCPaint(HRGN region) {
} else {
part = EP_EDITBORDER_HVSCROLL;
- if (!textfield_->IsEnabled())
+ if (!textfield_->enabled())
state = EPSHV_DISABLED;
else if (GetFocus() == m_hWnd)
state = EPSHV_FOCUSED;
@@ -883,7 +883,7 @@ void NativeTextfieldWin::OnNCPaint(HRGN region) {
}
int classic_state =
- (!textfield_->IsEnabled() || textfield_->read_only()) ? DFCS_INACTIVE : 0;
+ (!textfield_->enabled() || textfield_->read_only()) ? DFCS_INACTIVE : 0;
gfx::NativeThemeWin::instance()->PaintTextField(hdc, part, state,
classic_state, &window_rect,
« no previous file with comments | « ui/views/controls/textfield/native_textfield_views.cc ('k') | ui/views/controls/textfield/textfield.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698