summaryrefslogtreecommitdiffstats
path: root/views/controls/image_view.cc
diff options
context:
space:
mode:
authorctguil@chromium.org <ctguil@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2010-03-10 18:34:03 +0000
committerctguil@chromium.org <ctguil@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2010-03-10 18:34:03 +0000
commit4abaee203b9d0dfe8c2fb84682a564fe995b3c79 (patch)
tree7cc0237dfa00cbc87e6d769449c0e073cdc64a62 /views/controls/image_view.cc
parent6e64343accab0d5b5436645e40a36f5ff20d17ec (diff)
downloadchromium_src-4abaee203b9d0dfe8c2fb84682a564fe995b3c79.zip
chromium_src-4abaee203b9d0dfe8c2fb84682a564fe995b3c79.tar.gz
chromium_src-4abaee203b9d0dfe8c2fb84682a564fe995b3c79.tar.bz2
Landing tfarina CL.
Original patch by thiago.farina@gmail.com See original review at: http://codereview.chromium.org/668225/show BUG=9616 TEST=opens AccExplorer2, opens clear browsing data, select the a checkbox+label with the AccExplorer2 tool, see if the role for this control is checkbox. git-svn-id: svn://svn.chromium.org/chrome/trunk/src@41178 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'views/controls/image_view.cc')
-rw-r--r--views/controls/image_view.cc8
1 files changed, 3 insertions, 5 deletions
diff --git a/views/controls/image_view.cc b/views/controls/image_view.cc
index 2a7e18d..14a6219 100644
--- a/views/controls/image_view.cc
+++ b/views/controls/image_view.cc
@@ -81,7 +81,7 @@ void ImageView::ComputeImageOrigin(int image_width, int image_height,
gfx::Insets insets = GetInsets();
- switch(actual_horiz_alignment) {
+ switch (actual_horiz_alignment) {
case LEADING:
*x = insets.left();
break;
@@ -137,11 +137,9 @@ void ImageView::Paint(gfx::Canvas* canvas) {
}
bool ImageView::GetAccessibleName(std::wstring* name) {
- if (!name || tooltip_text_.empty())
- return false;
-
+ DCHECK(name);
*name = tooltip_text_;
- return true;
+ return !name->empty();
}
bool ImageView::GetAccessibleRole(AccessibilityTypes::Role* role) {