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 7021d4037e7795a8e4e272befa46df5ae4dd338e..df10c1a5d6a1e67024ac6747db2830282285bc63 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 |
@@ -67,7 +67,7 @@ void StatusTrayStateChangerWin::EnsureTrayIconVisible() { |
return; |
} |
- scoped_ptr<NOTIFYITEM> notify_item = RegisterCallback(); |
+ std::unique_ptr<NOTIFYITEM> notify_item = RegisterCallback(); |
// If the user has already hidden us explicitly, try to honor their choice by |
// not changing anything. |
@@ -149,7 +149,7 @@ bool StatusTrayStateChangerWin::CreateTrayNotify() { |
return false; |
} |
-scoped_ptr<NOTIFYITEM> StatusTrayStateChangerWin::RegisterCallback() { |
+std::unique_ptr<NOTIFYITEM> StatusTrayStateChangerWin::RegisterCallback() { |
// |notify_item_| is used to store the result of the callback from |
// Explorer.exe, which happens synchronously during |
// RegisterCallbackWin8 or RegisterCallbackLegacy. |
@@ -219,7 +219,7 @@ bool StatusTrayStateChangerWin::RegisterCallbackLegacy() { |
} |
void StatusTrayStateChangerWin::SendNotifyItemUpdate( |
- scoped_ptr<NOTIFYITEM> notify_item) { |
+ 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()); |