Handles conversion rule for TimeRole and updates InputTimeRole.

content/browser/accessibility/browser_accessibility_android.cc

 // Copyright 2013 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 "content/browser/accessibility/browser_accessibility_android.h"
 
 #include "base/i18n/break_iterator.h"
 #include "base/strings/string_util.h"
 #include "base/strings/stringprintf.h"
 #include "base/strings/utf_string_conversions.h"
@@ skipping 60 matching lines @@
       GetRole() == ui::AX_ROLE_ROOT_WEB_AREA ||
       GetRole() == ui::AX_ROLE_WEB_AREA) {
     return false;
   }
 
   // If it has a focusable child, we definitely can't leave out children.
   if (HasFocusableChild())
     return false;
 
   // Date and time controls should drop their children.
-  if (GetRole() == ui::AX_ROLE_DATE || GetRole() == ui::AX_ROLE_TIME)
+  if (GetRole() == ui::AX_ROLE_DATE || GetRole() == ui::AX_ROLE_INPUT_TIME)
     return true;
 
   // Headings with text can drop their children.
   base::string16 name = GetText();
   if (GetRole() == ui::AX_ROLE_HEADING && !name.empty())
     return true;
 
   // Focusable nodes with text can drop their children.
   if (HasState(ui::AX_STATE_FOCUSABLE) && !name.empty())
     return true;
@@ skipping 167 matching lines @@
     case ui::AX_ROLE_TEXT_FIELD:
       class_name = "android.widget.EditText";
       break;
     case ui::AX_ROLE_SLIDER:
       class_name = "android.widget.SeekBar";
       break;
     case ui::AX_ROLE_COLOR_WELL:
     case ui::AX_ROLE_COMBO_BOX:
     case ui::AX_ROLE_DATE:
     case ui::AX_ROLE_POP_UP_BUTTON:
-    case ui::AX_ROLE_TIME:
+    case ui::AX_ROLE_INPUT_TIME:
       class_name = "android.widget.Spinner";
       break;
     case ui::AX_ROLE_BUTTON:
     case ui::AX_ROLE_MENU_BUTTON:
       class_name = "android.widget.Button";
       break;
     case ui::AX_ROLE_CHECK_BOX:
     case ui::AX_ROLE_SWITCH:
       class_name = "android.widget.CheckBox";
       break;
@@ skipping 92 matching lines @@
   // title_elem_id is set, that means there's a label element
   // supplying the name and then name takes precedence over help.
   // TODO(dmazzoni): clean this up by providing more granular labels in
   // Blink, making the platform-specific mapping to accessible text simpler.
   base::string16 description = GetString16Attribute(ui::AX_ATTR_DESCRIPTION);
   base::string16 help = GetString16Attribute(ui::AX_ATTR_HELP);
 
   base::string16 placeholder;
   switch (GetRole()) {
     case ui::AX_ROLE_DATE:
+    case ui::AX_ROLE_INPUT_TIME:
     case ui::AX_ROLE_TEXT_FIELD:
-    case ui::AX_ROLE_TIME:
       GetHtmlAttribute("placeholder", &placeholder);
   }
 
   int title_elem_id = GetIntAttribute(
       ui::AX_ATTR_TITLE_UI_ELEMENT);
   base::string16 text;
   if (!description.empty())
     text = description;
   else if (title_elem_id && !name.empty())
     text = name;
@@ skipping 482 matching lines @@
 int BrowserAccessibilityAndroid::CountChildrenWithRole(ui::AXRole role) const {
   int count = 0;
   for (uint32 i = 0; i < PlatformChildCount(); i++) {
     if (PlatformGetChild(i)->GetRole() == role)
       count++;
   }
   return count;
 }
 
 }  // namespace content