Add tab status to accessibility labels

chrome/browser/ui/views/tabs/browser_tab_strip_controller.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/views/tabs/browser_tab_strip_controller.h"
 
 #include "base/auto_reset.h"
 #include "base/macros.h"
 #include "base/task_runner_util.h"
 #include "base/threading/sequenced_worker_pool.h"
@@ skipping 16 matching lines @@
 #include "chrome/browser/ui/views/tabs/tab_renderer_data.h"
 #include "chrome/browser/ui/views/tabs/tab_strip.h"
 #include "chrome/common/pref_names.h"
 #include "chrome/common/url_constants.h"
 #include "components/metrics/proto/omnibox_event.pb.h"
 #include "components/mime_util/mime_util.h"
 #include "components/omnibox/browser/autocomplete_classifier.h"
 #include "components/omnibox/browser/autocomplete_match.h"
 #include "components/prefs/pref_service.h"
 #include "content/public/browser/browser_thread.h"
+#include "content/public/browser/navigation_controller.h"
+#include "content/public/browser/navigation_entry.h"
+#include "content/public/browser/navigation_handle.h"
 #include "content/public/browser/notification_service.h"
 #include "content/public/browser/plugin_service.h"
 #include "content/public/browser/user_metrics.h"
 #include "content/public/browser/web_contents.h"
 #include "content/public/common/webplugininfo.h"
 #include "ipc/ipc_message.h"
 #include "net/base/filename_util.h"
 #include "ui/base/models/list_selection_model.h"
 #include "ui/gfx/image/image.h"
 #include "ui/views/controls/menu/menu_runner.h"
 #include "ui/views/widget/widget.h"
 #include "url/origin.h"
 
 using base::UserMetricsAction;
 using content::WebContents;
 
 namespace {
 
 TabRendererData::NetworkState TabContentsNetworkState(
     WebContents* contents) {
-  if (!contents || !contents->IsLoadingToDifferentDocument())
+  if (!contents)
     return TabRendererData::NETWORK_STATE_NONE;
+
+  if (!contents->IsLoadingToDifferentDocument()) {
+    content::NavigationEntry* entry =
+        contents->GetController().GetLastCommittedEntry();
+    if (entry && (entry->GetPageType() == content::PAGE_TYPE_ERROR))
+      return TabRendererData::NETWORK_STATE_ERROR;
+    return TabRendererData::NETWORK_STATE_NONE;
+  }
+
   if (contents->IsWaitingForResponse())
     return TabRendererData::NETWORK_STATE_WAITING;
   return TabRendererData::NETWORK_STATE_LOADING;
 }
 
 bool DetermineTabStripLayoutStacked(PrefService* prefs, bool* adjust_layout) {
   *adjust_layout = false;
   // For ash, always allow entering stacked mode.
 #if defined(USE_ASH)
   *adjust_layout = true;
@@ skipping 104 matching lines @@
   // appropriately as the user moves through the menu.
   TabStripModel::ContextMenuCommand last_command_;
 
   DISALLOW_COPY_AND_ASSIGN(TabContextMenuContents);
 };
 
 ////////////////////////////////////////////////////////////////////////////////
 // BrowserTabStripController, public:
 
 BrowserTabStripController::BrowserTabStripController(Browser* browser,
-                                                     TabStripModel* model)
+                                                     TabStripModel* model,
+                                                     BrowserView* browser_view)
     : model_(model),
       tabstrip_(NULL),
       browser_(browser),
+      browser_view_(browser_view),
       hover_tab_selector_(model),
       weak_ptr_factory_(this) {
   model_->AddObserver(this);
 
   local_pref_registrar_.Init(g_browser_process->local_state());
   local_pref_registrar_.Add(
       prefs::kTabStripStackedLayout,
       base::Bind(&BrowserTabStripController::UpdateStackedLayout,
                  base::Unretained(this)));
 }
@@ skipping 185 matching lines @@
   bool stacked_layout = DetermineTabStripLayoutStacked(
       g_browser_process->local_state(), &adjust_layout);
   if (!adjust_layout || stacked_layout == tabstrip_->stacked_layout())
     return;
 
   g_browser_process->local_state()->SetBoolean(prefs::kTabStripStackedLayout,
                                                tabstrip_->stacked_layout());
 }
 
 void BrowserTabStripController::OnStartedDraggingTabs() {
-  BrowserView* browser_view = BrowserView::GetBrowserViewForBrowser(browser_);
-  if (browser_view && !immersive_reveal_lock_.get()) {
+  if (browser_view_ && !immersive_reveal_lock_.get()) {

[sky, 2017/01/03 23:11:41]

browser_view_ should never be null, right?

[edwardjung, 2017/01/05 16:59:45]

Done.

     // The top-of-window views should be revealed while the user is dragging
     // tabs in immersive fullscreen. The top-of-window views may not be already
     // revealed if the user is attempting to attach a tab to a tabstrip
     // belonging to an immersive fullscreen window.
     immersive_reveal_lock_.reset(
-        browser_view->immersive_mode_controller()->GetRevealedLock(
+        browser_view_->immersive_mode_controller()->GetRevealedLock(
             ImmersiveModeController::ANIMATE_REVEAL_NO));
   }
 }
 
 void BrowserTabStripController::OnStoppedDraggingTabs() {
   immersive_reveal_lock_.reset();
 }
 
 void BrowserTabStripController::CheckFileSupported(const GURL& url) {
   base::PostTaskAndReplyWithResult(
       content::BrowserThread::GetBlockingPool(),
       FROM_HERE,
       base::Bind(&FindURLMimeType, url),
       base::Bind(&BrowserTabStripController::OnFindURLMimeTypeCompleted,
                  weak_ptr_factory_.GetWeakPtr(),
                  url));
 }
 
 SkColor BrowserTabStripController::GetToolbarTopSeparatorColor() const {
-  return BrowserView::GetBrowserViewForBrowser(browser_)->frame()
-      ->GetFrameView()->GetToolbarTopSeparatorColor();
+  return browser_view_->frame()->GetFrameView()->GetToolbarTopSeparatorColor();
+}
+
+base::string16 BrowserTabStripController::GetAccessibleTabName(
+    const Tab* tab) const {
+  return browser_view_->GetAccessibleTabLabel(
+      false /* include_app_name */, tabstrip_->GetModelIndexOfTab(tab));
 }
 
 ////////////////////////////////////////////////////////////////////////////////
 // BrowserTabStripController, TabStripModelObserver implementation:
 
 void BrowserTabStripController::TabInsertedAt(TabStripModel* tab_strip_model,
                                               WebContents* contents,
                                               int model_index,
                                               bool is_active) {
   DCHECK(contents);
@@ skipping 140 matching lines @@
   content::WebPluginInfo plugin;
   tabstrip_->FileSupported(
       url,
       mime_type.empty() || mime_util::IsSupportedMimeType(mime_type) ||
           content::PluginService::GetInstance()->GetPluginInfo(
               -1,                // process ID
               MSG_ROUTING_NONE,  // routing ID
               model_->profile()->GetResourceContext(), url, url::Origin(),
               mime_type, false, NULL, &plugin, NULL));
 }