diff options
Diffstat (limited to 'content/browser/accessibility')
13 files changed, 65 insertions, 58 deletions
diff --git a/content/browser/accessibility/accessibility_tree_formatter.cc b/content/browser/accessibility/accessibility_tree_formatter.cc index af33a42..999476f 100644 --- a/content/browser/accessibility/accessibility_tree_formatter.cc +++ b/content/browser/accessibility/accessibility_tree_formatter.cc @@ -79,7 +79,7 @@ void AccessibilityTreeFormatter::RecursiveFormatAccessibilityTree( const base::DictionaryValue& dict, base::string16* contents, int depth) { base::string16 line = ToString(dict, base::string16(depth * kIndentSpaces, ' ')); - if (line.find(ASCIIToUTF16(kSkipString)) != base::string16::npos) + if (line.find(base::ASCIIToUTF16(kSkipString)) != base::string16::npos) return; *contents += line; @@ -105,7 +105,7 @@ base::string16 AccessibilityTreeFormatter::ToString( int id_value; node.GetInteger("id", &id_value); return indent + base::IntToString16(id_value) + - ASCIIToUTF16("\n"); + base::ASCIIToUTF16("\n"); } void AccessibilityTreeFormatter::Initialize() {} @@ -152,7 +152,7 @@ bool AccessibilityTreeFormatter::MatchesFilters( if (iter->type == Filter::ALLOW_EMPTY) allow = true; else if (iter->type == Filter::ALLOW) - allow = (!MatchPattern(text, UTF8ToUTF16("*=''"))); + allow = (!MatchPattern(text, base::UTF8ToUTF16("*=''"))); else allow = false; } @@ -168,12 +168,12 @@ base::string16 AccessibilityTreeFormatter::FormatCoordinates( value.GetInteger(y_name, &y); std::string xy_str(base::StringPrintf("%s=(%d, %d)", name, x, y)); - return UTF8ToUTF16(xy_str); + return base::UTF8ToUTF16(xy_str); } void AccessibilityTreeFormatter::WriteAttribute( bool include_by_default, const std::string& attr, base::string16* line) { - WriteAttribute(include_by_default, UTF8ToUTF16(attr), line); + WriteAttribute(include_by_default, base::UTF8ToUTF16(attr), line); } void AccessibilityTreeFormatter::WriteAttribute( @@ -183,7 +183,7 @@ void AccessibilityTreeFormatter::WriteAttribute( if (!MatchesFilters(attr, include_by_default)) return; if (!line->empty()) - *line += ASCIIToUTF16(" "); + *line += base::ASCIIToUTF16(" "); *line += attr; } diff --git a/content/browser/accessibility/accessibility_tree_formatter_android.cc b/content/browser/accessibility/accessibility_tree_formatter_android.cc index 8ec3ecf..33b5196 100644 --- a/content/browser/accessibility/accessibility_tree_formatter_android.cc +++ b/content/browser/accessibility/accessibility_tree_formatter_android.cc @@ -122,7 +122,7 @@ base::string16 AccessibilityTreeFormatter::ToString( base::string16 class_value; dict.GetString("class", &class_value); - WriteAttribute(true, UTF16ToUTF8(class_value), &line); + WriteAttribute(true, base::UTF16ToUTF8(class_value), &line); for (unsigned i = 0; i < arraysize(BOOL_ATTRIBUTES); i++) { const char* attribute_name = BOOL_ATTRIBUTES[i]; @@ -151,7 +151,7 @@ base::string16 AccessibilityTreeFormatter::ToString( &line); } - return indent + line + ASCIIToUTF16("\n"); + return indent + line + base::ASCIIToUTF16("\n"); } // static diff --git a/content/browser/accessibility/accessibility_tree_formatter_gtk.cc b/content/browser/accessibility/accessibility_tree_formatter_gtk.cc index c930e0d..3891182 100644 --- a/content/browser/accessibility/accessibility_tree_formatter_gtk.cc +++ b/content/browser/accessibility/accessibility_tree_formatter_gtk.cc @@ -74,7 +74,7 @@ base::string16 AccessibilityTreeFormatter::ToString( base::StringPrintf("id=%d", id_value), &line); - return indent + line + ASCIIToUTF16("\n"); + return indent + line + base::ASCIIToUTF16("\n"); } void AccessibilityTreeFormatter::Initialize() {} diff --git a/content/browser/accessibility/accessibility_tree_formatter_mac.mm b/content/browser/accessibility/accessibility_tree_formatter_mac.mm index 021b5fd..230cd8d 100644 --- a/content/browser/accessibility/accessibility_tree_formatter_mac.mm +++ b/content/browser/accessibility/accessibility_tree_formatter_mac.mm @@ -171,7 +171,7 @@ base::string16 AccessibilityTreeFormatter::ToString( nil]; string s_value; dict.GetString(SysNSStringToUTF8(NSAccessibilityRoleAttribute), &s_value); - WriteAttribute(true, UTF8ToUTF16(s_value), &line); + WriteAttribute(true, base::UTF8ToUTF16(s_value), &line); string subroleAttribute = SysNSStringToUTF8(NSAccessibilitySubroleAttribute); if (dict.GetString(subroleAttribute, &s_value)) { @@ -218,7 +218,7 @@ base::string16 AccessibilityTreeFormatter::ToString( &line); } - return indent + line + ASCIIToUTF16("\n"); + return indent + line + base::ASCIIToUTF16("\n"); } // static diff --git a/content/browser/accessibility/accessibility_tree_formatter_win.cc b/content/browser/accessibility/accessibility_tree_formatter_win.cc index c50b526..401f89b 100644 --- a/content/browser/accessibility/accessibility_tree_formatter_win.cc +++ b/content/browser/accessibility/accessibility_tree_formatter_win.cc @@ -90,7 +90,7 @@ void AccessibilityTreeFormatter::AddProperties( for (std::vector<base::string16>::const_iterator it = state_strings.begin(); it != state_strings.end(); ++it) { - states->AppendString(UTF16ToUTF8(*it)); + states->AppendString(base::UTF16ToUTF8(*it)); } dict->Set("states", states); @@ -99,7 +99,7 @@ void AccessibilityTreeFormatter::AddProperties( for (std::vector<base::string16>::const_iterator it = ia2_attributes.begin(); it != ia2_attributes.end(); ++it) { - attributes->AppendString(UTF16ToUTF8(*it)); + attributes->AppendString(base::UTF16ToUTF8(*it)); } dict->Set("attributes", attributes); @@ -206,7 +206,7 @@ base::string16 AccessibilityTreeFormatter::ToString( base::string16 role_value; dict.GetString("role", &role_value); - WriteAttribute(true, UTF16ToUTF8(role_value), &line); + WriteAttribute(true, base::UTF16ToUTF8(role_value), &line); base::string16 name_value; dict.GetString("name", &name_value); @@ -225,7 +225,7 @@ base::string16 AccessibilityTreeFormatter::ToString( value->GetAsString(&string_value); WriteAttribute(false, StringPrintf(L"%ls='%ls'", - UTF8ToUTF16(attribute_name).c_str(), + base::UTF8ToUTF16(attribute_name).c_str(), string_value.c_str()), &line); break; @@ -235,7 +235,8 @@ base::string16 AccessibilityTreeFormatter::ToString( value->GetAsInteger(&int_value); WriteAttribute(false, base::StringPrintf(L"%ls=%d", - UTF8ToUTF16(attribute_name).c_str(), + base::UTF8ToUTF16( + attribute_name).c_str(), int_value), &line); break; @@ -245,7 +246,8 @@ base::string16 AccessibilityTreeFormatter::ToString( value->GetAsDouble(&double_value); WriteAttribute(false, base::StringPrintf(L"%ls=%.2f", - UTF8ToUTF16(attribute_name).c_str(), + base::UTF8ToUTF16( + attribute_name).c_str(), double_value), &line); break; @@ -287,7 +289,7 @@ base::string16 AccessibilityTreeFormatter::ToString( } } - return indent + line + ASCIIToUTF16("\n"); + return indent + line + base::ASCIIToUTF16("\n"); } // static diff --git a/content/browser/accessibility/accessibility_ui.cc b/content/browser/accessibility/accessibility_ui.cc index 5203af6..2937838 100644 --- a/content/browser/accessibility/accessibility_ui.cc +++ b/content/browser/accessibility/accessibility_ui.cc @@ -75,7 +75,7 @@ base::DictionaryValue* BuildTargetDescriptor(RenderViewHost* rvh) { // TODO(nasko): Fix the following code to use a consistent set of data // across the URL, title, and favicon. url = web_contents->GetURL(); - title = UTF16ToUTF8(web_contents->GetTitle()); + title = base::UTF16ToUTF8(web_contents->GetTitle()); NavigationController& controller = web_contents->GetController(); NavigationEntry* entry = controller.GetVisibleEntry(); if (entry != NULL && entry->GetURL().is_valid()) @@ -244,13 +244,14 @@ void AccessibilityUI::RequestAccessibilityTree(const base::ListValue* args) { } std::vector<AccessibilityTreeFormatter::Filter> filters; filters.push_back(AccessibilityTreeFormatter::Filter( - ASCIIToUTF16("*"), + base::ASCIIToUTF16("*"), AccessibilityTreeFormatter::Filter::ALLOW)); formatter->SetFilters(filters); formatter->FormatAccessibilityTree(&accessibility_contents_utf16); result->Set("tree", - new base::StringValue(UTF16ToUTF8(accessibility_contents_utf16))); + new base::StringValue( + base::UTF16ToUTF8(accessibility_contents_utf16))); web_ui()->CallJavascriptFunction("accessibility.showTree", *(result.get())); } diff --git a/content/browser/accessibility/accessibility_win_browsertest.cc b/content/browser/accessibility/accessibility_win_browsertest.cc index bb35348..b94e145 100644 --- a/content/browser/accessibility/accessibility_win_browsertest.cc +++ b/content/browser/accessibility/accessibility_win_browsertest.cc @@ -91,7 +91,7 @@ void RecursiveFindNodeInAccessibilityTree(IAccessible* node, // on the bots, this is really helpful in figuring out why. for (int i = 0; i < depth; i++) printf(" "); - printf("role=%d name=%s\n", V_I4(&role), WideToUTF8(name).c_str()); + printf("role=%d name=%s\n", V_I4(&role), base::WideToUTF8(name).c_str()); if (expected_role == V_I4(&role) && expected_name == name) { *found = true; @@ -286,7 +286,8 @@ void AccessibleChecker::AppendExpectedChild( } void AccessibleChecker::CheckAccessible(IAccessible* accessible) { - SCOPED_TRACE("while checking " + UTF16ToUTF8(RoleVariantToString(role_))); + SCOPED_TRACE("while checking " + + base::UTF16ToUTF8(RoleVariantToString(role_))); CheckAccessibleName(accessible); CheckAccessibleRole(accessible); CheckIA2Role(accessible); diff --git a/content/browser/accessibility/browser_accessibility.cc b/content/browser/accessibility/browser_accessibility.cc index 8429664..1fa15e0 100644 --- a/content/browser/accessibility/browser_accessibility.cc +++ b/content/browser/accessibility/browser_accessibility.cc @@ -481,7 +481,7 @@ base::string16 BrowserAccessibility::GetString16Attribute( std::string value_utf8; if (!GetStringAttribute(attribute, &value_utf8)) return base::string16(); - return UTF8ToUTF16(value_utf8); + return base::UTF8ToUTF16(value_utf8); } bool BrowserAccessibility::GetString16Attribute( @@ -490,7 +490,7 @@ bool BrowserAccessibility::GetString16Attribute( std::string value_utf8; if (!GetStringAttribute(attribute, &value_utf8)) return false; - *value = UTF8ToUTF16(value_utf8); + *value = base::UTF8ToUTF16(value_utf8); return true; } @@ -558,7 +558,7 @@ bool BrowserAccessibility::GetHtmlAttribute( std::string value_utf8; if (!GetHtmlAttribute(html_attr, &value_utf8)) return false; - *value = UTF8ToUTF16(value_utf8); + *value = base::UTF8ToUTF16(value_utf8); return true; } diff --git a/content/browser/accessibility/browser_accessibility_android.cc b/content/browser/accessibility/browser_accessibility_android.cc index 444aee2..b070475 100644 --- a/content/browser/accessibility/browser_accessibility_android.cc +++ b/content/browser/accessibility/browser_accessibility_android.cc @@ -284,13 +284,13 @@ base::string16 BrowserAccessibilityAndroid::GetText() const { case blink::WebAXRoleImageMapLink: case blink::WebAXRoleLink: if (!text.empty()) - text += ASCIIToUTF16(" "); - text += ASCIIToUTF16("Link"); + text += base::ASCIIToUTF16(" "); + text += base::ASCIIToUTF16("Link"); break; case blink::WebAXRoleHeading: // Only append "heading" if this node already has text. if (!text.empty()) - text += ASCIIToUTF16(" Heading"); + text += base::ASCIIToUTF16(" Heading"); break; } @@ -562,7 +562,7 @@ bool BrowserAccessibilityAndroid::HasOnlyStaticTextChildren() const { bool BrowserAccessibilityAndroid::IsIframe() const { base::string16 html_tag = GetString16Attribute( AccessibilityNodeData::ATTR_HTML_TAG); - return html_tag == ASCIIToUTF16("iframe"); + return html_tag == base::ASCIIToUTF16("iframe"); } void BrowserAccessibilityAndroid::PostInitialize() { diff --git a/content/browser/accessibility/browser_accessibility_cocoa.mm b/content/browser/accessibility/browser_accessibility_cocoa.mm index 9364dbb..6164f8a 100644 --- a/content/browser/accessibility/browser_accessibility_cocoa.mm +++ b/content/browser/accessibility/browser_accessibility_cocoa.mm @@ -1299,7 +1299,7 @@ NSDictionary* attributeToMethodNameMap = nil; base::string16 parentRole; browserAccessibility_->parent()->GetHtmlAttribute( "role", &parentRole); - const base::string16 treegridRole(ASCIIToUTF16("treegrid")); + const base::string16 treegridRole(base::ASCIIToUTF16("treegrid")); if (parentRole == treegridRole) { [ret addObjectsFromArray:[NSArray arrayWithObjects: NSAccessibilityDisclosingAttribute, diff --git a/content/browser/accessibility/browser_accessibility_win.cc b/content/browser/accessibility/browser_accessibility_win.cc index f3520da..8b3098d 100644 --- a/content/browser/accessibility/browser_accessibility_win.cc +++ b/content/browser/accessibility/browser_accessibility_win.cc @@ -480,7 +480,7 @@ STDMETHODIMP BrowserAccessibilityWin::get_accName(VARIANT var_id, BSTR* name) { if (name_str.empty()) return S_FALSE; - *name = SysAllocString(UTF8ToUTF16(name_str).c_str()); + *name = SysAllocString(base::UTF8ToUTF16(name_str).c_str()); DCHECK(*name); return S_OK; @@ -591,7 +591,7 @@ STDMETHODIMP BrowserAccessibilityWin::get_accValue(VARIANT var_id, return S_OK; } - *value = SysAllocString(UTF8ToUTF16(target->value()).c_str()); + *value = SysAllocString(base::UTF8ToUTF16(target->value()).c_str()); DCHECK(*value); return S_OK; } @@ -905,7 +905,7 @@ STDMETHODIMP BrowserAccessibilityWin::get_appName(BSTR* app_name) { DCHECK_EQ(2U, product_components.size()); if (product_components.size() != 2) return E_FAIL; - *app_name = SysAllocString(UTF8ToUTF16(product_components[0]).c_str()); + *app_name = SysAllocString(base::UTF8ToUTF16(product_components[0]).c_str()); DCHECK(*app_name); return *app_name ? S_OK : E_FAIL; } @@ -924,7 +924,8 @@ STDMETHODIMP BrowserAccessibilityWin::get_appVersion(BSTR* app_version) { DCHECK_EQ(2U, product_components.size()); if (product_components.size() != 2) return E_FAIL; - *app_version = SysAllocString(UTF8ToUTF16(product_components[1]).c_str()); + *app_version = + SysAllocString(base::UTF8ToUTF16(product_components[1]).c_str()); DCHECK(*app_version); return *app_version ? S_OK : E_FAIL; } @@ -953,7 +954,7 @@ STDMETHODIMP BrowserAccessibilityWin::get_toolkitVersion( return E_INVALIDARG; std::string user_agent = GetContentClient()->GetUserAgent(); - *toolkit_version = SysAllocString(UTF8ToUTF16(user_agent).c_str()); + *toolkit_version = SysAllocString(base::UTF8ToUTF16(user_agent).c_str()); DCHECK(*toolkit_version); return *toolkit_version ? S_OK : E_FAIL; } @@ -2435,7 +2436,7 @@ STDMETHODIMP BrowserAccessibilityWin::get_nodeInfo( *node_name = NULL; *name_space_id = 0; - *node_value = SysAllocString(UTF8ToUTF16(value()).c_str()); + *node_value = SysAllocString(base::UTF8ToUTF16(value()).c_str()); *num_children = PlatformChildCount(); *unique_id = unique_id_win_; @@ -2469,10 +2470,10 @@ STDMETHODIMP BrowserAccessibilityWin::get_attributes( for (unsigned short i = 0; i < *num_attribs; ++i) { attrib_names[i] = SysAllocString( - UTF8ToUTF16(html_attributes()[i].first).c_str()); + base::UTF8ToUTF16(html_attributes()[i].first).c_str()); name_space_id[i] = 0; attrib_values[i] = SysAllocString( - UTF8ToUTF16(html_attributes()[i].second).c_str()); + base::UTF8ToUTF16(html_attributes()[i].second).c_str()); } return S_OK; } @@ -2491,11 +2492,11 @@ STDMETHODIMP BrowserAccessibilityWin::get_attributesForNames( for (unsigned short i = 0; i < num_attribs; ++i) { name_space_id[i] = 0; bool found = false; - std::string name = UTF16ToUTF8((LPCWSTR)attrib_names[i]); + std::string name = base::UTF16ToUTF8((LPCWSTR)attrib_names[i]); for (unsigned int j = 0; j < html_attributes().size(); ++j) { if (html_attributes()[j].first == name) { attrib_values[i] = SysAllocString( - UTF8ToUTF16(html_attributes()[j].second).c_str()); + base::UTF8ToUTF16(html_attributes()[j].second).c_str()); found = true; break; } @@ -3081,7 +3082,7 @@ void BrowserAccessibilityWin::PostInitialize() { for (unsigned int i = 0; i < PlatformChildCount(); ++i) { BrowserAccessibility* child = PlatformGetChild(i); if (child->role() == blink::WebAXRoleStaticText) { - hypertext_ += UTF8ToUTF16(child->name()); + hypertext_ += base::UTF8ToUTF16(child->name()); } else { hyperlink_offset_to_index_[hypertext_.size()] = hyperlinks_.size(); hypertext_ += kEmbeddedCharacter; @@ -3216,7 +3217,7 @@ void BrowserAccessibilityWin::StringAttributeToIA2( const char* ia2_attr) { base::string16 value; if (GetString16Attribute(attribute, &value)) - ia2_attributes_.push_back(ASCIIToUTF16(ia2_attr) + L":" + value); + ia2_attributes_.push_back(base::ASCIIToUTF16(ia2_attr) + L":" + value); } void BrowserAccessibilityWin::BoolAttributeToIA2( @@ -3224,7 +3225,7 @@ void BrowserAccessibilityWin::BoolAttributeToIA2( const char* ia2_attr) { bool value; if (GetBoolAttribute(attribute, &value)) { - ia2_attributes_.push_back((ASCIIToUTF16(ia2_attr) + L":") + + ia2_attributes_.push_back((base::ASCIIToUTF16(ia2_attr) + L":") + (value ? L"true" : L"false")); } } @@ -3234,27 +3235,27 @@ void BrowserAccessibilityWin::IntAttributeToIA2( const char* ia2_attr) { int value; if (GetIntAttribute(attribute, &value)) { - ia2_attributes_.push_back(ASCIIToUTF16(ia2_attr) + L":" + + ia2_attributes_.push_back(base::ASCIIToUTF16(ia2_attr) + L":" + base::IntToString16(value)); } } base::string16 BrowserAccessibilityWin::GetValueText() { float fval; - base::string16 value = UTF8ToUTF16(this->value()); + base::string16 value = base::UTF8ToUTF16(this->value()); if (value.empty() && GetFloatAttribute(AccessibilityNodeData::ATTR_VALUE_FOR_RANGE, &fval)) { - value = UTF8ToUTF16(base::DoubleToString(fval)); + value = base::UTF8ToUTF16(base::DoubleToString(fval)); } return value; } base::string16 BrowserAccessibilityWin::TextForIAccessibleText() { if (IsEditableText()) - return UTF8ToUTF16(value()); + return base::UTF8ToUTF16(value()); return (blink_role() == blink::WebAXRoleStaticText) ? - UTF8ToUTF16(name()) : hypertext_; + base::UTF8ToUTF16(name()) : hypertext_; } void BrowserAccessibilityWin::HandleSpecialTextOffset( diff --git a/content/browser/accessibility/browser_accessibility_win_unittest.cc b/content/browser/accessibility/browser_accessibility_win_unittest.cc index 408fb4df..53d0076 100644 --- a/content/browser/accessibility/browser_accessibility_win_unittest.cc +++ b/content/browser/accessibility/browser_accessibility_win_unittest.cc @@ -549,7 +549,7 @@ TEST_F(BrowserAccessibilityTest, TestComplexHypertext) { const std::string embed = base::UTF16ToUTF8( BrowserAccessibilityWin::kEmbeddedCharacter); EXPECT_EQ(text1_name + embed + text2_name + embed, - UTF16ToUTF8(base::string16(text))); + base::UTF16ToUTF8(base::string16(text))); text.Reset(); long hyperlink_count; diff --git a/content/browser/accessibility/dump_accessibility_tree_browsertest.cc b/content/browser/accessibility/dump_accessibility_tree_browsertest.cc index 8cceea7..cfb0a27 100644 --- a/content/browser/accessibility/dump_accessibility_tree_browsertest.cc +++ b/content/browser/accessibility/dump_accessibility_tree_browsertest.cc @@ -88,9 +88,9 @@ class DumpAccessibilityTreeTest : public ContentBrowserTest { } void AddDefaultFilters(std::vector<Filter>* filters) { - filters->push_back(Filter(ASCIIToUTF16("FOCUSABLE"), Filter::ALLOW)); - filters->push_back(Filter(ASCIIToUTF16("READONLY"), Filter::ALLOW)); - filters->push_back(Filter(ASCIIToUTF16("*=''"), Filter::DENY)); + filters->push_back(Filter(base::ASCIIToUTF16("FOCUSABLE"), Filter::ALLOW)); + filters->push_back(Filter(base::ASCIIToUTF16("READONLY"), Filter::ALLOW)); + filters->push_back(Filter(base::ASCIIToUTF16("*=''"), Filter::DENY)); } void ParseFilters(const std::string& test_html, @@ -109,13 +109,15 @@ class DumpAccessibilityTreeTest : public ContentBrowserTest { AccessibilityTreeFormatter::GetDenyString(); if (StartsWithASCII(line, allow_empty_str, true)) { filters->push_back( - Filter(UTF8ToUTF16(line.substr(allow_empty_str.size())), + Filter(base::UTF8ToUTF16(line.substr(allow_empty_str.size())), Filter::ALLOW_EMPTY)); } else if (StartsWithASCII(line, allow_str, true)) { - filters->push_back(Filter(UTF8ToUTF16(line.substr(allow_str.size())), + filters->push_back(Filter(base::UTF8ToUTF16( + line.substr(allow_str.size())), Filter::ALLOW)); } else if (StartsWithASCII(line, deny_str, true)) { - filters->push_back(Filter(UTF8ToUTF16(line.substr(deny_str.size())), + filters->push_back(Filter(base::UTF8ToUTF16( + line.substr(deny_str.size())), Filter::DENY)); } } @@ -170,7 +172,7 @@ void DumpAccessibilityTreeTest::RunTest( // Load the page. base::string16 html_contents16; - html_contents16 = UTF8ToUTF16(html_contents); + html_contents16 = base::UTF8ToUTF16(html_contents); GURL url = GetTestUrl("accessibility", html_file.BaseName().MaybeAsASCII().c_str()); AccessibilityNotificationWaiter waiter( @@ -193,7 +195,7 @@ void DumpAccessibilityTreeTest::RunTest( // Perform a diff (or write the initial baseline). base::string16 actual_contents_utf16; formatter.FormatAccessibilityTree(&actual_contents_utf16); - std::string actual_contents = UTF16ToUTF8(actual_contents_utf16); + std::string actual_contents = base::UTF16ToUTF8(actual_contents_utf16); std::vector<std::string> actual_lines, expected_lines; Tokenize(actual_contents, "\n", &actual_lines); Tokenize(expected_contents, "\n", &expected_lines); |