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

Unified Diff: win8/test/ui_automation_client.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 side-by-side diff with in-line comments
Download patch
« no previous file with comments | « win8/metro_driver/ime/text_service.cc ('k') | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: win8/test/ui_automation_client.cc
diff --git a/win8/test/ui_automation_client.cc b/win8/test/ui_automation_client.cc
index 32d87f8f92892a962e442df1da1504127fefb7ee..6a859af3dbd8d3722a1f1fd49d7d840da98e5d9f 100644
--- a/win8/test/ui_automation_client.cc
+++ b/win8/test/ui_automation_client.cc
@@ -315,12 +315,13 @@ void UIAutomationClient::Context::HandleWindowOpen(
return;
}
- if (V_VT(&var) != VT_BSTR) {
- LOG(ERROR) << __FUNCTION__ << " class name is not a BSTR: " << V_VT(&var);
+ if (V_VT(var.ptr()) != VT_BSTR) {
+ LOG(ERROR) << __FUNCTION__
+ << " class name is not a BSTR: " << V_VT(var.ptr());
return;
}
- base::string16 class_name(V_BSTR(&var));
+ base::string16 class_name(V_BSTR(var.ptr()));
// Window class names are atoms, which are case-insensitive.
if (class_name.size() == class_name_.size() &&
@@ -533,11 +534,11 @@ HRESULT UIAutomationClient::Context::GetInvokableItems(
LOG(ERROR) << std::hex << result;
continue;
}
- if (V_VT(&var) != VT_BSTR) {
- LOG(ERROR) << __FUNCTION__ << " name is not a BSTR: " << V_VT(&var);
+ if (V_VT(var.ptr()) != VT_BSTR) {
+ LOG(ERROR) << __FUNCTION__ << " name is not a BSTR: " << V_VT(var.ptr());
continue;
}
- choices->push_back(base::string16(V_BSTR(&var)));
+ choices->push_back(base::string16(V_BSTR(var.ptr())));
var.Reset();
}
@@ -564,13 +565,13 @@ void UIAutomationClient::Context::CloseWindow(
return;
}
- if (V_VT(&var) != VT_I4) {
+ if (V_VT(var.ptr()) != VT_I4) {
LOG(ERROR) << __FUNCTION__
- << " window handle is not an int: " << V_VT(&var);
+ << " window handle is not an int: " << V_VT(var.ptr());
return;
}
- HWND handle = reinterpret_cast<HWND>(V_I4(&var));
+ HWND handle = reinterpret_cast<HWND>(V_I4(var.ptr()));
uint32 scan_code = MapVirtualKey(VK_ESCAPE, MAPVK_VK_TO_VSC);
PostMessage(handle, WM_KEYDOWN, VK_ESCAPE,
« no previous file with comments | « win8/metro_driver/ime/text_service.cc ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698