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

Unified Diff: chrome/browser/ui/views/status_icons/status_tray_win.h

Issue 1865213004: Convert //chrome/browser/ui from scoped_ptr to std::unique_ptr (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: rebase Created 4 years, 8 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: chrome/browser/ui/views/status_icons/status_tray_win.h
diff --git a/chrome/browser/ui/views/status_icons/status_tray_win.h b/chrome/browser/ui/views/status_icons/status_tray_win.h
index b00f7cdb3f2dcf6ef6ec72777d4305fa32b0454e..a06d4589eed3247815c9eae7ec0f03bd25290cb9 100644
--- a/chrome/browser/ui/views/status_icons/status_tray_win.h
+++ b/chrome/browser/ui/views/status_icons/status_tray_win.h
@@ -7,10 +7,11 @@
#include <windows.h>
+#include <memory>
+
#include "base/compiler_specific.h"
#include "base/gtest_prod_util.h"
#include "base/macros.h"
-#include "base/memory/scoped_ptr.h"
#include "chrome/browser/status_icons/status_tray.h"
class StatusIconWin;
@@ -54,7 +55,7 @@ class StatusTrayWin : public StatusTray {
UINT NextIconId();
void SetStatusTrayStateChangerProxyForTest(
- scoped_ptr<StatusTrayStateChangerProxy> proxy);
+ std::unique_ptr<StatusTrayStateChangerProxy> proxy);
// The unique icon ID we will assign to the next icon.
UINT next_icon_id_;
@@ -74,7 +75,7 @@ class StatusTrayWin : public StatusTray {
// Manages changes performed on a background thread to manipulate visibility
// of notification icons.
- scoped_ptr<StatusTrayStateChangerProxy> state_changer_proxy_;
+ std::unique_ptr<StatusTrayStateChangerProxy> state_changer_proxy_;
DISALLOW_COPY_AND_ASSIGN(StatusTrayWin);
};

Powered by Google App Engine
This is Rietveld 408576698