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

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

Issue 723803002: Remove implicit conversions from scoped_refptr to T* in chrome/browser/ui (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 6 years, 1 month 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/ui/views/frame/browser_view.cc ('k') | chrome/browser/ui/webui/help/version_updater_win.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 5be4f732d3da016bed13415c03a73727e0ce4606..053ac9a0fe4f3756c0c627db32371e765a3e4e51 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
@@ -131,14 +131,14 @@ bool StatusTrayStateChangerWin::CreateTrayNotify() {
return false;
base::win::ScopedComPtr<ITrayNotifyWin8> tray_notify_win8;
- hr = tray_notify_win8.QueryFrom(tray_notify_);
+ hr = tray_notify_win8.QueryFrom(tray_notify_.get());
if (SUCCEEDED(hr)) {
interface_version_ = INTERFACE_VERSION_WIN8;
return true;
}
base::win::ScopedComPtr<ITrayNotify> tray_notify_legacy;
- hr = tray_notify_legacy.QueryFrom(tray_notify_);
+ hr = tray_notify_legacy.QueryFrom(tray_notify_.get());
if (SUCCEEDED(hr)) {
interface_version_ = INTERFACE_VERSION_LEGACY;
return true;
@@ -176,7 +176,7 @@ scoped_ptr<NOTIFYITEM> StatusTrayStateChangerWin::RegisterCallback() {
bool StatusTrayStateChangerWin::RegisterCallbackWin8() {
base::win::ScopedComPtr<ITrayNotifyWin8> tray_notify_win8;
- HRESULT hr = tray_notify_win8.QueryFrom(tray_notify_);
+ HRESULT hr = tray_notify_win8.QueryFrom(tray_notify_.get());
if (FAILED(hr))
return false;
@@ -196,7 +196,7 @@ bool StatusTrayStateChangerWin::RegisterCallbackWin8() {
bool StatusTrayStateChangerWin::RegisterCallbackLegacy() {
base::win::ScopedComPtr<ITrayNotify> tray_notify;
- HRESULT hr = tray_notify.QueryFrom(tray_notify_);
+ HRESULT hr = tray_notify.QueryFrom(tray_notify_.get());
if (FAILED(hr)) {
return false;
}
@@ -223,12 +223,12 @@ void StatusTrayStateChangerWin::SendNotifyItemUpdate(
scoped_ptr<NOTIFYITEM> notify_item) {
if (interface_version_ == INTERFACE_VERSION_LEGACY) {
base::win::ScopedComPtr<ITrayNotify> tray_notify;
- HRESULT hr = tray_notify.QueryFrom(tray_notify_);
+ HRESULT hr = tray_notify.QueryFrom(tray_notify_.get());
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_);
+ HRESULT hr = tray_notify.QueryFrom(tray_notify_.get());
if (SUCCEEDED(hr))
tray_notify->SetPreference(notify_item.get());
}
« no previous file with comments | « chrome/browser/ui/views/frame/browser_view.cc ('k') | chrome/browser/ui/webui/help/version_updater_win.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698