Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(375)

Side by Side Diff: content/browser/accessibility/accessibility_tree_formatter_win.cc

Issue 2870263002: Rename ScopedComPtr::Receive to ScopedComPtr::GetAddressOf (Closed)
Patch Set: Rebase to 2a6f440 Created 3 years, 7 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 unified diff | Download patch
OLDNEW
1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
2 // Use of this source code is governed by a BSD-style license that can be 2 // Use of this source code is governed by a BSD-style license that can be
3 // found in the LICENSE file. 3 // found in the LICENSE file.
4 4
5 #include "content/browser/accessibility/accessibility_tree_formatter.h" 5 #include "content/browser/accessibility/accessibility_tree_formatter.h"
6 6
7 #include <oleacc.h> 7 #include <oleacc.h>
8 #include <stddef.h> 8 #include <stddef.h>
9 #include <stdint.h> 9 #include <stdint.h>
10 10
(...skipping 113 matching lines...) Expand 10 before | Expand all | Expand 10 after
124 LONG index_of_embed; 124 LONG index_of_embed;
125 hr = ax_object.GetCOM()->get_hyperlinkIndex(character_index, 125 hr = ax_object.GetCOM()->get_hyperlinkIndex(character_index,
126 &index_of_embed); 126 &index_of_embed);
127 // S_FALSE will be returned if no embedded object is found at the given 127 // S_FALSE will be returned if no embedded object is found at the given
128 // embedded character offset. Exclude child index from such cases. 128 // embedded character offset. Exclude child index from such cases.
129 LONG child_index = -1; 129 LONG child_index = -1;
130 if (hr == S_OK) { 130 if (hr == S_OK) {
131 DCHECK_GE(index_of_embed, 0); 131 DCHECK_GE(index_of_embed, 0);
132 base::win::ScopedComPtr<IAccessibleHyperlink> embedded_object; 132 base::win::ScopedComPtr<IAccessibleHyperlink> embedded_object;
133 hr = ax_object.GetCOM()->get_hyperlink(index_of_embed, 133 hr = ax_object.GetCOM()->get_hyperlink(index_of_embed,
134 embedded_object.Receive()); 134 embedded_object.GetAddressOf());
135 DCHECK(SUCCEEDED(hr)); 135 DCHECK(SUCCEEDED(hr));
136 base::win::ScopedComPtr<IAccessible2> ax_embed; 136 base::win::ScopedComPtr<IAccessible2> ax_embed;
137 hr = embedded_object.CopyTo(ax_embed.Receive()); 137 hr = embedded_object.CopyTo(ax_embed.GetAddressOf());
138 DCHECK(SUCCEEDED(hr)); 138 DCHECK(SUCCEEDED(hr));
139 hr = ax_embed->get_indexInParent(&child_index); 139 hr = ax_embed->get_indexInParent(&child_index);
140 DCHECK(SUCCEEDED(hr)); 140 DCHECK(SUCCEEDED(hr));
141 } 141 }
142 142
143 base::string16 child_index_str(L"<obj"); 143 base::string16 child_index_str(L"<obj");
144 if (child_index >= 0) { 144 if (child_index >= 0) {
145 base::StringAppendF(&child_index_str, L"%d>", child_index); 145 base::StringAppendF(&child_index_str, L"%d>", child_index);
146 } else { 146 } else {
147 base::StringAppendF(&child_index_str, L">"); 147 base::StringAppendF(&child_index_str, L">");
(...skipping 307 matching lines...) Expand 10 before | Expand all | Expand 10 after
455 455
456 const std::string AccessibilityTreeFormatterWin::GetAllowString() { 456 const std::string AccessibilityTreeFormatterWin::GetAllowString() {
457 return "@WIN-ALLOW:"; 457 return "@WIN-ALLOW:";
458 } 458 }
459 459
460 const std::string AccessibilityTreeFormatterWin::GetDenyString() { 460 const std::string AccessibilityTreeFormatterWin::GetDenyString() {
461 return "@WIN-DENY:"; 461 return "@WIN-DENY:";
462 } 462 }
463 463
464 } // namespace content 464 } // namespace content
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698