Add tab status to accessibility labels

chrome/browser/ui/views/frame/browser_view.cc

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..6b8c7589d038f80433796beee6da5eed3ca72c62 100644
--- a/chrome/browser/ui/views/frame/browser_view.cc
+++ b/chrome/browser/ui/views/frame/browser_view.cc
@@ -1595,12 +1595,73 @@ base::string16 BrowserView::GetWindowTitle() const {
 
 base::string16 BrowserView::GetAccessibleWindowTitle() const {
   const bool include_app_name = false;
-  if (IsIncognito()) {
-    return l10n_util::GetStringFUTF16(
-        IDS_ACCESSIBLE_INCOGNITO_WINDOW_TITLE_FORMAT,
-        browser_->GetWindowTitleForCurrentTab(include_app_name));
+  int active_index = browser_->tab_strip_model()->active_index();
+  if (active_index > -1) {
+    Tab* current_tab = tabstrip_->tab_at(active_index);
+
+    if (IsIncognito()) {
+      return l10n_util::GetStringFUTF16(
+          IDS_ACCESSIBLE_INCOGNITO_WINDOW_TITLE_FORMAT,
+          GetAccessibleTabLabel(include_app_name, current_tab->data()));
+    }
+    return GetAccessibleTabLabel(include_app_name, current_tab->data());
+  } else {
+    if (IsIncognito()) {
+      return l10n_util::GetStringFUTF16(
+          IDS_ACCESSIBLE_INCOGNITO_WINDOW_TITLE_FORMAT,
+          browser_->GetWindowTitleForCurrentTab(include_app_name));
+    }
+    return browser_->GetWindowTitleForCurrentTab(include_app_name);
+  }
+}
+
+base::string16 BrowserView::GetAccessibleTabLabel(
+    bool include_app_name,
+    const TabRendererData& data) const {
+  base::string16 window_title =
+      browser_->GetWindowTitleForCurrentTab(include_app_name);

[sky, 2016/12/16 00:52:51]

Shouldn't you only do this for the active tab? Maybe you want
Browser::GetWindowTitleForTab() and you supply the tab (that doesn't exist now,
I'm suggesting you create it).

[edwardjung, 2016/12/19 12:59:25]

Good point, changed.

+  base::string16 tab_label;
+  if (data.IsCrashed()) {
+    // Tab has crashed.
+    tab_label = l10n_util::GetStringFUTF16(IDS_TAB_AX_LABEL_CRASHED_FORMAT,

[sky, 2016/12/16 00:52:51]

As you only set the label and then return at the end of the function early
return from all of these rather than adding an unnecessary local (when you do
that, don't use else ifs, see style guide for details).

[edwardjung, 2016/12/19 12:59:25]

Done.

+                                           window_title);
+  } else if (data.network_state == TabRendererData::NETWORK_STATE_ERROR) {
+    // Network error interstitial.
+    tab_label = l10n_util::GetStringFUTF16(
+        IDS_TAB_AX_LABEL_NETWORK_ERROR_FORMAT, window_title);
+  } else {
+    // Alert tab states.
+    switch (data.alert_state) {
+      case TabAlertState::AUDIO_PLAYING:
+        tab_label = l10n_util::GetStringFUTF16(
+            IDS_TAB_AX_LABEL_AUDIO_PLAYING_FORMAT, window_title);
+        break;
+      case TabAlertState::USB_CONNECTED:
+        tab_label = l10n_util::GetStringFUTF16(
+            IDS_TAB_AX_LABEL_USB_CONNECTED_FORMAT, window_title);
+        break;
+      case TabAlertState::BLUETOOTH_CONNECTED:
+        tab_label = l10n_util::GetStringFUTF16(
+            IDS_TAB_AX_LABEL_BLUETOOTH_CONNECTED_FORMAT, window_title);
+        break;
+      case TabAlertState::MEDIA_RECORDING:
+        tab_label = l10n_util::GetStringFUTF16(
+            IDS_TAB_AX_LABEL_MEDIA_RECORDING_FORMAT, window_title);
+        break;
+      case TabAlertState::AUDIO_MUTING:
+        tab_label = l10n_util::GetStringFUTF16(
+            IDS_TAB_AX_LABEL_AUDIO_MUTING_FORMAT, window_title);
+        break;
+      case TabAlertState::TAB_CAPTURING:
+        tab_label = l10n_util::GetStringFUTF16(
+            IDS_TAB_AX_LABEL_TAB_CAPTURING_FORMAT, window_title);
+        break;
+      case TabAlertState::NONE:
+        tab_label = window_title;
+        break;
+    }
   }
-  return browser_->GetWindowTitleForCurrentTab(include_app_name);
+  return tab_label;
 }
 
 views::View* BrowserView::GetInitiallyFocusedView() {