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

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

Issue 985853005: base: Remove operator& from ScopedVariant and ScopedPropVariant. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: scoped-operator: prop-ptr Created 5 years, 9 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 2014 The Chromium Authors. All rights reserved. 1 // Copyright 2014 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_event_recorder.h" 5 #include "content/browser/accessibility/accessibility_event_recorder.h"
6 6
7 #include <oleacc.h> 7 #include <oleacc.h>
8 8
9 #include <string> 9 #include <string>
10 10
11 #include "base/strings/string_number_conversions.h" 11 #include "base/strings/string_number_conversions.h"
12 #include "base/strings/string_util.h" 12 #include "base/strings/string_util.h"
13 #include "base/strings/stringprintf.h" 13 #include "base/strings/stringprintf.h"
14 #include "base/strings/utf_string_conversions.h" 14 #include "base/strings/utf_string_conversions.h"
15 #include "base/win/scoped_bstr.h" 15 #include "base/win/scoped_bstr.h"
16 #include "base/win/scoped_comptr.h" 16 #include "base/win/scoped_comptr.h"
17 #include "base/win/scoped_variant.h" 17 #include "base/win/scoped_variant.h"
18 #include "content/browser/accessibility/accessibility_tree_formatter_utils_win.h " 18 #include "content/browser/accessibility/accessibility_tree_formatter_utils_win.h "
19 #include "content/browser/accessibility/browser_accessibility_manager.h" 19 #include "content/browser/accessibility/browser_accessibility_manager.h"
20 #include "content/browser/accessibility/browser_accessibility_win.h" 20 #include "content/browser/accessibility/browser_accessibility_win.h"
21 #include "third_party/iaccessible2/ia2_api_all.h" 21 #include "third_party/iaccessible2/ia2_api_all.h"
22 #include "ui/base/win/atl_module.h" 22 #include "ui/base/win/atl_module.h"
23 23
24 namespace content { 24 namespace content {
25 25
26 namespace { 26 namespace {
27 27
28 std::string RoleVariantToString(const base::win::ScopedVariant& role) { 28 std::string RoleVariantToString(const base::win::ScopedVariant& role) {
29 if (role.type() == VT_I4) { 29 if (role.type() == VT_I4) {
30 return base::UTF16ToUTF8(IAccessibleRoleToString(V_I4(&role))); 30 return base::UTF16ToUTF8(IAccessibleRoleToString(V_I4(role.ptr())));
31 } else if (role.type() == VT_BSTR) { 31 } else if (role.type() == VT_BSTR) {
32 return base::UTF16ToUTF8( 32 return base::UTF16ToUTF8(
33 base::string16(V_BSTR(&role), SysStringLen(V_BSTR(&role)))); 33 base::string16(V_BSTR(role.ptr()), SysStringLen(V_BSTR(role.ptr()))));
34 } 34 }
35 return std::string(); 35 return std::string();
36 } 36 }
37 37
38 HRESULT QueryIAccessible2(IAccessible* accessible, IAccessible2** accessible2) { 38 HRESULT QueryIAccessible2(IAccessible* accessible, IAccessible2** accessible2) {
39 base::win::ScopedComPtr<IServiceProvider> service_provider; 39 base::win::ScopedComPtr<IServiceProvider> service_provider;
40 HRESULT hr = accessible->QueryInterface(service_provider.Receive()); 40 HRESULT hr = accessible->QueryInterface(service_provider.Receive());
41 return SUCCEEDED(hr) ? 41 return SUCCEEDED(hr) ?
42 service_provider->QueryService(IID_IAccessible2, accessible2) : hr; 42 service_provider->QueryService(IID_IAccessible2, accessible2) : hr;
43 } 43 }
(...skipping 208 matching lines...) Expand 10 before | Expand all | Expand 10 after
252 if (accessibility_hwnd != hwnd) 252 if (accessibility_hwnd != hwnd)
253 return E_FAIL; 253 return E_FAIL;
254 254
255 IAccessible* obj = manager_->GetRoot()->ToBrowserAccessibilityWin(); 255 IAccessible* obj = manager_->GetRoot()->ToBrowserAccessibilityWin();
256 obj->AddRef(); 256 obj->AddRef();
257 *ppv_object = obj; 257 *ppv_object = obj;
258 return S_OK; 258 return S_OK;
259 } 259 }
260 260
261 } // namespace content 261 } // namespace content
OLDNEW
« no previous file with comments | « chrome/installer/util/wmi.cc ('k') | content/browser/accessibility/accessibility_win_browsertest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698