content/browser/accessibility/accessibility_tree_formatter_win.cc - Issue 1874893002: Convert //content/browser from scoped_ptr to std::unique_ptr

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_win.cc

Issue 1874893002: Convert //content/browser from scoped_ptr to std::unique_ptr (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: Created 4 years, 8 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 | « content/browser/accessibility/accessibility_tree_formatter_mac.mm ('k') | content/browser/accessibility/accessibility_ui.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: content/browser/accessibility/accessibility_tree_formatter_win.cc

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

index eaf4fc8f4aa669b4fba39842ef16b33db0e5cc65..6e70d53ba8480dbea206f75e5f61eff3d467d66a 100644

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

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

@@ -189,14 +189,14 @@ void AccessibilityTreeFormatterWin::AddProperties(

IAccessibleStateToStringVector(ia_state, &state_strings);

IAccessible2StateToStringVector(ax_object->ia2_state(), &state_strings);

- scoped_ptr<base::ListValue> states(new base::ListValue());

+ std::unique_ptr<base::ListValue> states(new base::ListValue());

for (const base::string16& state_string : state_strings)

states->AppendString(base::UTF16ToUTF8(state_string));

dict->Set("states", std::move(states));

const std::vector<base::string16>& ia2_attributes =

ax_object->ia2_attributes();

- scoped_ptr<base::ListValue> attributes(new base::ListValue());

+ std::unique_ptr<base::ListValue> attributes(new base::ListValue());

for (const base::string16& ia2_attribute : ia2_attributes)

attributes->AppendString(base::UTF16ToUTF8(ia2_attribute));

dict->Set("attributes", std::move(attributes));

@@ -204,7 +204,7 @@ void AccessibilityTreeFormatterWin::AddProperties(

ax_object->ComputeStylesIfNeeded();

const std::map<int, std::vector<base::string16>>& ia2_text_attributes =

ax_object->offset_to_text_attributes();

- scoped_ptr<base::ListValue> text_attributes(new base::ListValue());

+ std::unique_ptr<base::ListValue> text_attributes(new base::ListValue());

for (const auto& style_span : ia2_text_attributes) {

int start_offset = style_span.first;

text_attributes->AppendString("offset:" + base::IntToString(start_offset));