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

Unified Diff: chrome/browser/ui/views/frame/browser_view.cc

Issue 2581023002: Add tab status to accessibility labels (Closed)
Patch Set: Return early if invalid tab index Created 3 years, 11 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
Index: chrome/browser/ui/views/frame/browser_view.cc
diff --git a/chrome/browser/ui/views/frame/browser_view.cc b/chrome/browser/ui/views/frame/browser_view.cc
index f2a776f3b188e2ffb5e54ed5588256b86d3b0d6b..7ac8883bf3214d7204f6fa0b7bdee7e95a3cd2a7 100644
--- a/chrome/browser/ui/views/frame/browser_view.cc
+++ b/chrome/browser/ui/views/frame/browser_view.cc
@@ -1595,6 +1595,15 @@ base::string16 BrowserView::GetWindowTitle() const {
base::string16 BrowserView::GetAccessibleWindowTitle() const {
const bool include_app_name = false;
+ int active_index = browser_->tab_strip_model()->active_index();
+ if (active_index > -1) {
+ if (IsIncognito()) {
+ return l10n_util::GetStringFUTF16(
+ IDS_ACCESSIBLE_INCOGNITO_WINDOW_TITLE_FORMAT,
+ GetAccessibleTabLabel(include_app_name, active_index));
+ }
+ return GetAccessibleTabLabel(include_app_name, active_index);
+ }
if (IsIncognito()) {
return l10n_util::GetStringFUTF16(
IDS_ACCESSIBLE_INCOGNITO_WINDOW_TITLE_FORMAT,
@@ -1603,6 +1612,53 @@ base::string16 BrowserView::GetAccessibleWindowTitle() const {
return browser_->GetWindowTitleForCurrentTab(include_app_name);
}
+base::string16 BrowserView::GetAccessibleTabLabel(bool include_app_name,
+ int index) const {
+ // ChromeVox provides an invalid index on browser start up before
+ // any tabs are created.
+ if (index == -1)
+ return base::string16();
+
+ base::string16 window_title =
+ browser_->GetWindowTitleForTab(include_app_name, index);
+ const TabRendererData& data = tabstrip_->tab_at(index)->data();
+
+ // Tab has crashed.
+ if (data.IsCrashed()) {
+ return l10n_util::GetStringFUTF16(IDS_TAB_AX_LABEL_CRASHED_FORMAT,
+ window_title);
+ }
+ // Network error interstitial.
+ if (data.network_state == TabRendererData::NETWORK_STATE_ERROR) {
+ return l10n_util::GetStringFUTF16(IDS_TAB_AX_LABEL_NETWORK_ERROR_FORMAT,
+ window_title);
+ }
+ // Alert tab states.
+ switch (data.alert_state) {
+ case TabAlertState::AUDIO_PLAYING:
+ return l10n_util::GetStringFUTF16(IDS_TAB_AX_LABEL_AUDIO_PLAYING_FORMAT,
+ window_title);
+ case TabAlertState::USB_CONNECTED:
+ return l10n_util::GetStringFUTF16(IDS_TAB_AX_LABEL_USB_CONNECTED_FORMAT,
+ window_title);
+ case TabAlertState::BLUETOOTH_CONNECTED:
+ return l10n_util::GetStringFUTF16(
+ IDS_TAB_AX_LABEL_BLUETOOTH_CONNECTED_FORMAT, window_title);
+ case TabAlertState::MEDIA_RECORDING:
+ return l10n_util::GetStringFUTF16(
+ IDS_TAB_AX_LABEL_MEDIA_RECORDING_FORMAT, window_title);
+ case TabAlertState::AUDIO_MUTING:
+ return l10n_util::GetStringFUTF16(IDS_TAB_AX_LABEL_AUDIO_MUTING_FORMAT,
+ window_title);
+ case TabAlertState::TAB_CAPTURING:
+ return l10n_util::GetStringFUTF16(IDS_TAB_AX_LABEL_TAB_CAPTURING_FORMAT,
+ window_title);
+ case TabAlertState::NONE:
+ return window_title;
+ }
+ return base::string16();
+}
+
views::View* BrowserView::GetInitiallyFocusedView() {
return nullptr;
}
@@ -2021,8 +2077,7 @@ void BrowserView::InitViews() {
// TabStrip takes ownership of the controller.
BrowserTabStripController* tabstrip_controller =
- new BrowserTabStripController(browser_.get(),
- browser_->tab_strip_model());
+ new BrowserTabStripController(browser_->tab_strip_model(), this);
tabstrip_ = new TabStrip(tabstrip_controller);
top_container_->AddChildView(tabstrip_);
tabstrip_controller->InitFromModel(tabstrip_);
« no previous file with comments | « chrome/browser/ui/views/frame/browser_view.h ('k') | chrome/browser/ui/views/tabs/browser_tab_strip_controller.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698