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

Unified Diff: ui/app_list/views/search_result_view.cc

Issue 935523002: App launcher: Spoken feedback reads out details of search results. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Added NON_EXPORTED_BASE to fix Windows compile. Created 5 years, 10 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:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « ui/app_list/views/search_result_view.h ('k') | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: ui/app_list/views/search_result_view.cc
diff --git a/ui/app_list/views/search_result_view.cc b/ui/app_list/views/search_result_view.cc
index 2d5efed6ebdc09acbd6874633a17ec160a852677..3bfd6569e9e6ab9186856182910d4f465f1bd99a 100644
--- a/ui/app_list/views/search_result_view.cc
+++ b/ui/app_list/views/search_result_view.cc
@@ -6,6 +6,7 @@
#include <algorithm>
+#include "base/strings/utf_string_conversions.h"
#include "ui/app_list/app_list_constants.h"
#include "ui/app_list/app_list_switches.h"
#include "ui/app_list/search_result.h"
@@ -120,12 +121,12 @@ void SearchResultView::ClearSelectedAction() {
void SearchResultView::UpdateTitleText() {
if (!result_ || result_->title().empty()) {
title_text_.reset();
- SetAccessibleName(base::string16());
} else {
title_text_.reset(CreateRenderText(result_->title(),
result_->title_tags()));
- SetAccessibleName(result_->title());
}
+
+ UpdateAccessibleName();
}
void SearchResultView::UpdateDetailsText() {
@@ -135,6 +136,24 @@ void SearchResultView::UpdateDetailsText() {
details_text_.reset(CreateRenderText(result_->details(),
result_->details_tags()));
}
+
+ UpdateAccessibleName();
+}
+
+base::string16 SearchResultView::ComputeAccessibleName() const {
+ if (!result_)
+ return base::string16();
+
+ base::string16 accessible_name = result_->title();
+ if (!result_->title().empty() && !result_->details().empty())
+ accessible_name += base::ASCIIToUTF16(", ");
+ accessible_name += result_->details();
+
+ return accessible_name;
+}
+
+void SearchResultView::UpdateAccessibleName() {
+ SetAccessibleName(ComputeAccessibleName());
}
const char* SearchResultView::GetClassName() const {
« no previous file with comments | « ui/app_list/views/search_result_view.h ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698