diff options
| author | avi@chromium.org <avi@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-01-14 18:34:56 +0000 |
|---|---|---|
| committer | avi@chromium.org <avi@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-01-14 18:34:56 +0000 |
| commit | 001f08ab3184a370fdd1e8cf4cef05fa15174bd9 (patch) | |
| tree | 2d808b05a8f8294af7346c0e7f8af472266023e1 /views/controls/textfield | |
| parent | 6784252af99d1da6c63871374d9409998c64ef5b (diff) | |
| download | chromium_src-001f08ab3184a370fdd1e8cf4cef05fa15174bd9.zip chromium_src-001f08ab3184a370fdd1e8cf4cef05fa15174bd9.tar.gz chromium_src-001f08ab3184a370fdd1e8cf4cef05fa15174bd9.tar.bz2 | |
Remove wstring from views. Part 3: Switch accessibility strings to string16.
BUG=68267
TEST=no visible changes; all tests pass
Review URL: http://codereview.chromium.org/6192007
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@71461 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'views/controls/textfield')
| -rw-r--r-- | views/controls/textfield/native_textfield_win.cc | 10 | ||||
| -rw-r--r-- | views/controls/textfield/textfield.cc | 6 | ||||
| -rw-r--r-- | views/controls/textfield/textfield.h | 6 |
3 files changed, 11 insertions, 11 deletions
diff --git a/views/controls/textfield/native_textfield_win.cc b/views/controls/textfield/native_textfield_win.cc index 63e3082..9b5595b 100644 --- a/views/controls/textfield/native_textfield_win.cc +++ b/views/controls/textfield/native_textfield_win.cc @@ -395,13 +395,13 @@ void NativeTextfieldWin::InitializeAccessibilityInfo() { // Set the accessible name by getting the label text. View* parent = textfield_->GetParent(); int label_index = parent->GetChildIndex(textfield_) - 1; - if (label_index >= 0) { + if (label_index >= 0) { // Try to find the name of this text field. // We expect it to be a Label preceeding this view (if it exists). - std::wstring name; - View* label_view = parent->GetChildViewAt(label_index ); - if (label_view ->GetClassName() == Label::kViewClassName && - label_view ->GetAccessibleName(&name)) { + string16 name; + View* label_view = parent->GetChildViewAt(label_index); + if (label_view->GetClassName() == Label::kViewClassName && + label_view->GetAccessibleName(&name)) { hr = pAccPropServices->SetHwndPropStr(m_hWnd, OBJID_CLIENT, CHILDID_SELF, PROPID_ACC_NAME, name.c_str()); } diff --git a/views/controls/textfield/textfield.cc b/views/controls/textfield/textfield.cc index 66f7489..50e6b94 100644 --- a/views/controls/textfield/textfield.cc +++ b/views/controls/textfield/textfield.cc @@ -327,10 +327,10 @@ AccessibilityTypes::State Textfield::GetAccessibleState() { return state; } -std::wstring Textfield::GetAccessibleValue() { +string16 Textfield::GetAccessibleValue() { if (!text_.empty()) - return UTF16ToWide(text_); - return std::wstring(); + return text_; + return string16(); } void Textfield::SetEnabled(bool enabled) { diff --git a/views/controls/textfield/textfield.h b/views/controls/textfield/textfield.h index afcc441..3d7ce38 100644 --- a/views/controls/textfield/textfield.h +++ b/views/controls/textfield/textfield.h @@ -209,9 +209,9 @@ class Textfield : public View { virtual void WillLoseFocus(); // Accessibility accessors, overridden from View: - virtual AccessibilityTypes::Role GetAccessibleRole(); - virtual AccessibilityTypes::State GetAccessibleState(); - virtual std::wstring GetAccessibleValue(); + virtual AccessibilityTypes::Role GetAccessibleRole() OVERRIDE; + virtual AccessibilityTypes::State GetAccessibleState() OVERRIDE; + virtual string16 GetAccessibleValue() OVERRIDE; protected: virtual void Focus(); |