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

Unified Diff: win8/metro_driver/ime/text_service.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: 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
Index: win8/metro_driver/ime/text_service.cc
diff --git a/win8/metro_driver/ime/text_service.cc b/win8/metro_driver/ime/text_service.cc
index 6eec40fb74a17005c59e1815c139a74da74e4e3e..4601f27b381316fc8e4233755bcbee6bf7ae6a78 100644
--- a/win8/metro_driver/ime/text_service.cc
+++ b/win8/metro_driver/ime/text_service.cc
@@ -111,7 +111,7 @@ bool InitializeSentenceMode(ITfThreadMgr* thread_manager,
base::win::ScopedVariant sentence_variant;
sentence_variant.Set(TF_SENTENCEMODE_PHRASEPREDICT);
- hr = sentence_compartment->SetValue(client_id, &sentence_variant);
+ hr = sentence_compartment->SetValue(client_id, sentence_variant.ptr());
if (FAILED(hr)) {
LOG(ERROR) << "ITfCompartment::SetValue failed. hr = " << hr;
return false;
@@ -138,7 +138,7 @@ bool InitializeDisabledContext(ITfContext* context, TfClientId client_id) {
base::win::ScopedVariant variant;
variant.Set(1);
- hr = disabled_compartment->SetValue(client_id, &variant);
+ hr = disabled_compartment->SetValue(client_id, variant.ptr());
if (FAILED(hr)) {
LOG(ERROR) << "ITfCompartment::SetValue failed. hr = " << hr;
return false;
@@ -154,7 +154,7 @@ bool InitializeDisabledContext(ITfContext* context, TfClientId client_id) {
base::win::ScopedVariant empty_context_variant;
empty_context_variant.Set(static_cast<int32>(1));
- hr = empty_context->SetValue(client_id, &empty_context_variant);
+ hr = empty_context->SetValue(client_id, empty_context_variant.ptr());
if (FAILED(hr)) {
LOG(ERROR) << "ITfCompartment::SetValue failed. hr = " << hr;
return false;

Powered by Google App Engine
This is Rietveld 408576698