Add tab status to accessibility labels

chrome/browser/ui/tabs/tab_utils.cc

 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "chrome/browser/ui/tabs/tab_utils.h"
 
 #include <utility>
 
 #include "base/command_line.h"
 #include "base/strings/string16.h"
@@ skipping 41 matching lines @@
 // the usual 60 FPS because a trade-off must be made between tab UI animation
 // smoothness and media recording/playback performance on low-end hardware.
 const int kIndicatorFrameIntervalMs = 50;  // 20 FPS
 
 // Fade-in/out duration for the tab indicator animations.  Fade-in is quick to
 // immediately notify the user.  Fade-out is more gradual, so that the user has
 // a chance of finding a tab that has quickly "blipped" on and off.
 const int kIndicatorFadeInDurationMs = 200;
 const int kIndicatorFadeOutDurationMs = 1000;
 
+// Network state indicating an error.
+const int kNetworkStateError = 3;

[dmazzoni, 2016/11/14 21:59:02]

Can you use TabRendererData::NetworkState?

Maybe that should be pulled up to a more general source
file?

[edwardjung, 2016/11/24 11:36:43]

Makes sense, separating this tooltip change into a new CL.

+
 // Animation that throbs in (towards 1.0) and out (towards 0.0), and ends in the
 // "in" state.
 class TabRecordingIndicatorAnimation : public gfx::MultiAnimation {
  public:
   ~TabRecordingIndicatorAnimation() override {}
 
   // Overridden to provide alternating "towards in" and "towards out" behavior.
   double GetCurrentValue() const override;
 
   static std::unique_ptr<TabRecordingIndicatorAnimation> Create();
@@ skipping 171 matching lines @@
       gfx::Tween::EASE_IN));
   const base::TimeDelta interval =
       base::TimeDelta::FromMilliseconds(kIndicatorFrameIntervalMs);
   std::unique_ptr<gfx::MultiAnimation> animation(
       new gfx::MultiAnimation(parts, interval));
   animation->set_continuous(false);
   return std::move(animation);
 }
 
 base::string16 AssembleTabTooltipText(const base::string16& title,
-                                      TabAlertState alert_state) {
+                                      TabAlertState alert_state,
+                                      int network_state) {
+  base::string16 result = title;
+  if (!result.empty())
+    result.append(1, '\n');
+
+  if (network_state == kNetworkStateError) {
+    result.append(
+          l10n_util::GetStringUTF16(IDS_TAB_AX_LABEL_NETWORK_ERROR));
+    return result;
+  }
   if (alert_state == TabAlertState::NONE)
     return title;
 
-  base::string16 result = title;
-  if (!result.empty())
-    result.append(1, '\n');
   switch (alert_state) {
     case TabAlertState::AUDIO_PLAYING:
       result.append(
           l10n_util::GetStringUTF16(IDS_TOOLTIP_TAB_ALERT_STATE_AUDIO_PLAYING));
       break;
     case TabAlertState::AUDIO_MUTING:
       result.append(
           l10n_util::GetStringUTF16(IDS_TOOLTIP_TAB_ALERT_STATE_AUDIO_MUTING));
       break;
     case TabAlertState::MEDIA_RECORDING:
@@ skipping 104 matching lines @@
                      const std::vector<int>& indices) {
   for (std::vector<int>::const_iterator i = indices.begin(); i != indices.end();
        ++i) {
     if (!tab_strip.GetWebContentsAt(*i)->IsAudioMuted())
       return false;
   }
   return true;
 }
 
 }  // namespace chrome