Revert of Various changes required to support ChromeVox Next to read Views and Windows.

ui/views/accessibility/ax_window_obj_wrapper.cc

 // Copyright 2014 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 "ui/views/accessibility/ax_window_obj_wrapper.h"
 
 #include "base/strings/utf_string_conversions.h"
 #include "ui/accessibility/ax_node_data.h"
 #include "ui/aura/window.h"
 #include "ui/views/accessibility/ax_aura_obj_cache.h"
@@ skipping 31 matching lines @@
   if (widget)
     out_children->push_back(AXAuraObjCache::GetInstance()->GetOrCreate(widget));
 }
 
 void AXWindowObjWrapper::Serialize(ui::AXNodeData* out_node_data) {
   out_node_data->id = GetID();
   out_node_data->role = ui::AX_ROLE_WINDOW;
   // TODO(dtseng): Set better states.
   out_node_data->state = 0;
   out_node_data->location = window_->bounds();
-
-  // Root windows currently have a non readable name (e.g. Display1234...);
-  // ignore them unless the window is the only node in the tree.
-  if (window_->parent() || window_->children().size() == 0) {
-    out_node_data->AddStringAttribute(ui::AX_ATTR_NAME,
-                                      base::UTF16ToUTF8(window_->title()));
-  }
+  out_node_data->AddStringAttribute(
+      ui::AX_ATTR_NAME, base::UTF16ToUTF8(window_->title()));
 }
 
 int32 AXWindowObjWrapper::GetID() {
   return AXAuraObjCache::GetInstance()->GetID(window_);
 }
 
 void AXWindowObjWrapper::OnWindowDestroying(aura::Window* window) {
   AXAuraObjCache::GetInstance()->Remove(window);
 }
 
 }  // namespace views