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

Unified Diff: chrome/browser/ui/views/message_center/web_notification_tray.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/message_center/web_notification_tray.h
diff --git a/chrome/browser/ui/views/message_center/web_notification_tray.h b/chrome/browser/ui/views/message_center/web_notification_tray.h
index ef4724e9b3db6acfa091127db480ff1fa570d88c..ce975c9ae53e4807fabb4f446bf77c8202f3f267 100644
--- a/chrome/browser/ui/views/message_center/web_notification_tray.h
+++ b/chrome/browser/ui/views/message_center/web_notification_tray.h
@@ -5,9 +5,10 @@
#ifndef CHROME_BROWSER_UI_VIEWS_MESSAGE_CENTER_WEB_NOTIFICATION_TRAY_H_
#define CHROME_BROWSER_UI_VIEWS_MESSAGE_CENTER_WEB_NOTIFICATION_TRAY_H_
+#include <memory>
+
#include "base/gtest_prod_util.h"
#include "base/macros.h"
-#include "base/memory/scoped_ptr.h"
#include "ui/message_center/message_center_tray_delegate.h"
#include "ui/views/widget/widget_observer.h"
@@ -47,10 +48,10 @@ class WebNotificationTray : public message_center::MessageCenterTrayDelegate {
FRIEND_TEST_ALL_PREFIXES(WebNotificationTrayTest, ManyPopupNotifications);
FRIEND_TEST_ALL_PREFIXES(WebNotificationTrayTest, ManuallyCloseMessageCenter);
- scoped_ptr<MessagePopupCollection> popup_collection_;
- scoped_ptr<DesktopPopupAlignmentDelegate> alignment_delegate_;
+ std::unique_ptr<MessagePopupCollection> popup_collection_;
+ std::unique_ptr<DesktopPopupAlignmentDelegate> alignment_delegate_;
- scoped_ptr<MessageCenterTray> message_center_tray_;
+ std::unique_ptr<MessageCenterTray> message_center_tray_;
DISALLOW_COPY_AND_ASSIGN(WebNotificationTray);
};

Powered by Google App Engine
This is Rietveld 408576698