content/browser/accessibility/accessibility_tree_formatter_utils_win.cc - Issue 1223153003: Move JoinString to the base namespace

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

Unified Diff: content/browser/accessibility/accessibility_tree_formatter_utils_win.cc

Issue 1223153003: Move JoinString to the base namespace (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: windows Created 5 years, 5 months ago

Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.

Jump to:

View side-by-side diff with in-line comments

Download patch

« no previous file with comments | « components/view_manager/test_change_tracker.cc ('k') | content/browser/accessibility/dump_accessibility_browsertest_base.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: content/browser/accessibility/accessibility_tree_formatter_utils_win.cc

diff --git a/content/browser/accessibility/accessibility_tree_formatter_utils_win.cc b/content/browser/accessibility/accessibility_tree_formatter_utils_win.cc

index 063f5cd759c4100701285a2c418fd8bd4edd1b69..0355078c07a04fb73eb8c48856b0fea2287f00af 100644

--- a/content/browser/accessibility/accessibility_tree_formatter_utils_win.cc

+++ b/content/browser/accessibility/accessibility_tree_formatter_utils_win.cc

@@ -11,6 +11,7 @@

#include "base/memory/singleton.h"

#include "base/strings/string_util.h"

+#include "base/strings/utf_string_conversions.h"

#include "third_party/iaccessible2/ia2_api_all.h"

namespace content {

@@ -314,7 +315,7 @@ void IAccessibleStateToStringVector(int32 ia_state,

base::string16 IAccessibleStateToString(int32 ia_state) {

std::vector<base::string16> strings;

IAccessibleStateToStringVector(ia_state, &strings);

- return JoinString(strings, ',');

+ return base::JoinString(strings, base::ASCIIToUTF16(","));

}

void IAccessible2StateToStringVector(int32 ia2_state,

@@ -331,7 +332,7 @@ void IAccessible2StateToStringVector(int32 ia2_state,

base::string16 IAccessible2StateToString(int32 ia2_state) {

std::vector<base::string16> strings;

IAccessible2StateToStringVector(ia2_state, &strings);

- return JoinString(strings, ',');

+ return base::JoinString(strings, base::ASCIIToUTF16(","));

}

base::string16 AccessibilityEventToString(int32 event_id) {