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

Unified Diff: chrome/browser/ui/views/status_icons/status_tray_state_changer_win.cc

Issue 2885063003: Remove ScopedComPtr::QueryFrom() (Closed)
Patch Set: 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 side-by-side diff with in-line comments
Download patch
« no previous file with comments | « chrome/browser/shell_integration_win.cc ('k') | chrome/browser/win/settings_app_monitor.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/browser/ui/views/status_icons/status_tray_state_changer_win.cc
diff --git a/chrome/browser/ui/views/status_icons/status_tray_state_changer_win.cc b/chrome/browser/ui/views/status_icons/status_tray_state_changer_win.cc
index b5d3f83ee80271793cc8cff9ee1954a2ddbee443..dcdd49fc07dac41ac9133f69c6314b82fb3194a1 100644
--- a/chrome/browser/ui/views/status_icons/status_tray_state_changer_win.cc
+++ b/chrome/browser/ui/views/status_icons/status_tray_state_changer_win.cc
@@ -132,14 +132,14 @@ bool StatusTrayStateChangerWin::CreateTrayNotify() {
return false;
base::win::ScopedComPtr<ITrayNotifyWin8> tray_notify_win8;
- hr = tray_notify_win8.QueryFrom(tray_notify_.Get());
+ hr = tray_notify_.CopyTo(tray_notify_win8.GetAddressOf());
if (SUCCEEDED(hr)) {
interface_version_ = INTERFACE_VERSION_WIN8;
return true;
}
base::win::ScopedComPtr<ITrayNotify> tray_notify_legacy;
- hr = tray_notify_legacy.QueryFrom(tray_notify_.Get());
+ hr = tray_notify_.CopyTo(tray_notify_legacy.GetAddressOf());
if (SUCCEEDED(hr)) {
interface_version_ = INTERFACE_VERSION_LEGACY;
return true;
@@ -174,7 +174,7 @@ std::unique_ptr<NOTIFYITEM> StatusTrayStateChangerWin::RegisterCallback() {
bool StatusTrayStateChangerWin::RegisterCallbackWin8() {
base::win::ScopedComPtr<ITrayNotifyWin8> tray_notify_win8;
- HRESULT hr = tray_notify_win8.QueryFrom(tray_notify_.Get());
+ HRESULT hr = tray_notify_.CopyTo(tray_notify_win8.GetAddressOf());
if (FAILED(hr))
return false;
@@ -194,7 +194,7 @@ bool StatusTrayStateChangerWin::RegisterCallbackWin8() {
bool StatusTrayStateChangerWin::RegisterCallbackLegacy() {
base::win::ScopedComPtr<ITrayNotify> tray_notify;
- HRESULT hr = tray_notify.QueryFrom(tray_notify_.Get());
+ HRESULT hr = tray_notify_.CopyTo(tray_notify.GetAddressOf());
if (FAILED(hr)) {
return false;
}
@@ -221,12 +221,12 @@ void StatusTrayStateChangerWin::SendNotifyItemUpdate(
std::unique_ptr<NOTIFYITEM> notify_item) {
if (interface_version_ == INTERFACE_VERSION_LEGACY) {
base::win::ScopedComPtr<ITrayNotify> tray_notify;
- HRESULT hr = tray_notify.QueryFrom(tray_notify_.Get());
+ HRESULT hr = tray_notify_.CopyTo(tray_notify.GetAddressOf());
if (SUCCEEDED(hr))
tray_notify->SetPreference(notify_item.get());
} else if (interface_version_ == INTERFACE_VERSION_WIN8) {
base::win::ScopedComPtr<ITrayNotifyWin8> tray_notify;
- HRESULT hr = tray_notify.QueryFrom(tray_notify_.Get());
+ HRESULT hr = tray_notify_.CopyTo(tray_notify.GetAddressOf());
if (SUCCEEDED(hr))
tray_notify->SetPreference(notify_item.get());
}
« no previous file with comments | « chrome/browser/shell_integration_win.cc ('k') | chrome/browser/win/settings_app_monitor.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698